refixed #1563
Merge branch 'master' into workshop