Merge pull request #1493 from Hixie/semantics

Semantics updates