Updates for VS 2013 support