Commit 644c1097a8402d170603f5a0ff17efb37360dac7

Don 2018-03-20T15:55:41

Fix Windows tests within CMake