Merge remote-tracking branch 'origin/vs2010'
Merge remote-tracking branch 'origin/master' into vs2010