Merge branch 'master' into msbuilddll2