Merge branch 'doc-file-GLOB-no-order' into release