Merge from upstream before branching.