Merge branch 'jk/maint-fast-import-doc-reorder'