Not that I wanted to go far with this, but updating to VS 2015
Authored by: tart 2016-04-08
Parent: [r904]
Child: [r906]
