Merge branch 'mh/maint-config-doc-proxy-command' into maint-1.7.11