Fixes #4363
Thanks, let's see if jenkins approves and we'll get it in :)
Pull-Request has been merged by pingou
Fixes #4363