Use better platform test in Version cmake file when working with multiple toolchains.
Merge remote-tracking branch 'origin/master' into windev