(fixes #2754)
(fixes #2754)
Merge samuelmz/buildbot:fixes#2754 (PR #1134)