Merge changes from "Dynamo.sln" into "Dynamo.2012.sln"