Merge branch 'test-doctest-sort-entries' into 'master'