Merge branch 'fc/contrib-bzr-hg-fixes'