content, tidy up build.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	doc/devtools/devtools.md