Merge branch 'master' into ripley-config-env-test