Merge branch 'master' into defaults-extra-file