Merge branch 'vs2012'