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