Merge branch 'ticket2370' of git://github.com/ffledgling/buildbot