Update to match errata

Turns out I had this right first time based on the draft. I changed to match
the RFC, then spotted a published errata which made it sane again.
Merge branch 'master' into issue1