Merge branch 'master' into rel-env-path