Fixes #3977
:thumbsup:
rebased onto c9ac743373938c0782d77bfb9bb0b05bfb1481f5
Thanks for this! :)
Pull-Request has been merged by pingou
Fixes #3977