Merge commit 'linus' into next