It'd be worth rebasing *before* doing that, as I had to copy in these changes into the attachments branch, so you'll have an easier time rebasing if you do that before making any changes.