[httpie/epel7: 2/2] Merge branch 'master' into epel7