Merge branch 'nd/wildmatch'