Merge branch 'master' into safe-config-parsing