Merge commit 'linus/master' into merge-linus