Added some more HTTP headers
auto-merge staging into master