Reconstructed changes by psykidellic and myself in bzr_buildbot in this version