Merge pull request #10092 from tannergooding/vs2017