Should fix #1762.
Merge branch 'master' into development
Merge branch 'development' into 1.8