Merge branch 'master' into scm-commands