Merge pull request #1 from akamai-tech/master

Update to draft-12