Final commit from VS2012