Changes for VS-2012.