Hand merging in https://github.com/ekr/simple-push-protocol/compare/cleanup2