Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-precious