Merge branch 'nd/maint-compat-fnmatch-fix' into maint