Merge "master" into "next".