SSPCPP-689: Move Solution up to VS2015