Merge pull request #1692 from Hixie/overflow-and-offstage

OffStage