Improve support for Visual Studio 2015 preview