Grammar!
Use local headers variable
Merge branch 'master' into develop
Fix to handle both http and https urls.