Merge branch 'nd/retire-fnmatch'