buildbot/buildbot — pull request #1422 by benallard (2014-12-08 10:50:18+00:00)
Title: Pr/1417

This is a follow-up on PR #1417.

Test now pass locally, master branch should be usable again with that.