Merge "next" branch into "master".