Merge branch 'topic/timb' into for-linus