Merge branch 'fc/remote-bzr'