Merge branch 'master' into pwmin-new