Resync with bzr trunk as it looks like we missed something.