Windows related fixes
Merge branch 'master' into v171

Conflicts:
	version.h