Fixed #1447
Merge branch 'master' into workshop