Fix some Windows problems.
Merge branch 'master' into commonjs

Conflicts:
	source/console/config.js