Made changes to merge VisualStudio2015UltimatePreview from alexinslc.