Merge master into release.