Merge 'master' into 'next'.