- Removed the solution folder from the VS2010 build.
Merge remote-tracking branch 'upstream/development' into development