Fixed #1485
Merge branch 'master' into workshop