Updated VS2010 .sln file
Merge remote-tracking branch 'upstream/master'