NewRelic backport due to clobbering headers in Curb, which caused Feedzira to fail.
Merge branch 'master' into starline
env