Starting Visual Studio 2010 updates.
Trying to fix conflicts.
Revert "Replacing lost changes."

This reverts commit 3660ff6dc4032c78491e89bfbab5d4afc88d93a7.
Revert "Additional fixes for CMake compiler support."

This reverts commit 771483fa73ec4954649ebceb18191ffbc9fb2e4c.