Merge branch 'nd/make-wildmatch-default'