Fixes #3690 Thanks for the report & patch!
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'