Merge branches 'master' and 'next' into next