Fix build if VS2010 and VS2012 are both installed.
Merge branch 'release' into dev