Merge branch 'jk/gitignore-anchored'