Merge branch 'nd/no-more-fnmatch'