Merge master into output branch.