Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fixed cmake for windows builds
fix executables on osx/linux
Merge remote-tracking branch 'upstream/master'
fixed cmake on OSX/Linux