Merge branch 'fix/followredirects-hackney' into 'develop'