Fixed #1526
Merge branch 'master' into workshop