Merge branch 'jc/maint-fnmatch-old-style-definition'