Merge branch 'topic/docbook-fix' into for-linus