Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into maint