Merge branch 'jc/gitignore-precedence' into maint