Merge 'next' into 'master'.