Merge branch 'linus' into release