Update to VS2012 for Win32 only
Merge remote-tracking branch 'origin/master' into KytheraSpecific