Merge branch 'topic/doc' into for-linus