Merge master changes into release candidate branch.