Merge branch 'bug415' of git://github.com/Pike/buildbot into bug415