Altering the way headers are set - this seems to work for me where as the current implementation does not
Merge branch 'araines-fix-headers'