Merge branch 'master' into enviro-non-plus