Merge branch 'master' into non-bin/master