continue in master
bugfix4711
Merge branch 'hotfix'