Merge branch 'vs2012_warnings'