2124: Respect add_header param, herp derp
Merge branch 'i-2124' into production