Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5