Merge master to release branch.