rebased onto 04bd07248280ae9c3420d14972aeffe5899578d2
Commit 615b25b3 fixes this pull-request
Pull-Request has been merged by pingou