Merge branch 'msbuilddll2'