non-release version of build.py.
update to latest version.
Merge remote-tracking branch 'origin/master' into gh-pages