Merge branch 'master' into bugfix-56