Reverted merge, because of different toolset (VS2012)