Fixed #1659
Merge branch 'master' into workshop