Commit a82b456e98b0f3fbafe76725d1a1503d458a2178

Anthony Green 2018-03-27T11:49:46

msvc fixes