Merge remote-tracking branch 'steven/for-linus' into for-linus