Merge branch 'bzr/lp'