Merge branch 'jh/push-default-upstream-configname' into maint