Merge master into branch.