Pull in changes to Help and build.py