Merge branches 'next' and 'master'