cmake changes for windows 8 vs 10
Merge branch 'master' into devel