Added more RFC 4229 headers
auto-merge staging into master