Fixes #3726
:thumbsup: let's see if jenkins is happy
rebased onto 0dd0cd28b72fa712e614d06757a4ac3ae956967f
Jenkins passed + I rebased. Should be ok to merge.
Pull-Request has been merged by pingou
Fixes #3726