Added RFC 2231 data
auto-merge staging into master
Added RFC 5987 defs
auto-merge staging into master