Merge branch 'rr/test-make-sure-we-have-git' into maint