Fixed #1465
Merge branch 'master' into workshop