Patch for buildbot bug 2536

See http://trac.buildbot.net/ticket/2536