Fix build on Windows
Merge branch 'master' into xwt

Conflicts:
	.gitignore