Fixes #4187
rebased onto d7d4884f6ad11f4dd3ec3d6de786d64bf12267ac
All green, thanks! :)
Pull-Request has been merged by pingou
Fixes #4187