buildbot/buildbot — pull request #1349 by sa2ajj (2014-11-14 08:00:06+00:00)
Title: Fix 3025

Backport of GH-1300