VS 2010 solution update.
Merge remote-tracking branch 'uvs/master'