Merge branch 'jh/loose-object-dirs-creation-race' into maint