What should we do now? I'd like to have the branch merged in before the bug bash.