Windows bugfixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/it/casperjs-runner/toolchain-overwrite/pom.xml