Fixed #1539
Merge branch 'master' into workshop