Merge branch 'master' of https://github.com/OpenLightingProject/buildbot
Merge branch 'master' of https://github.com/peternewman/buildbot