Fix Windows build instructions
Merge remote-tracking branch 'origin/master' into winreadme

Conflicts:
	README.md