Merge branch 'master' into feature-location-after-redirect
Allow to override max redirects on a per-request basis, using options on client
Merge branch 'feature-location-after-redirect' into patch