Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11