Bring in internal changes.
Merge pull request #11 from cloudflare/next

Bring in internal changes.