Fixed #1577
Merge branch 'master' into workshop