one step closer
Merge branch 'master' into windows

Conflicts:
	build.py