Here we are again fixing up the VS2012 project.
Merge remote-tracking branch 'fluffyfreak/UpdateVS2012'