Merge branch 'github-master' into upstream-master

Conflicts:
	master/buildbot/steps/http.py
Merge branch 'upstream-master' of https://github.com/madazone/buildbot into upstream-master

Conflicts:
	master/buildbot/steps/http.py