Fixes #3642
Merge pull request #3972 from Zuhayr/master

Fixes #3642