Merge branch 'jc/maint-doc-git-add-example' into maint