Merge branch 'dev/bzr' into next