Merge pull request #1081 from jgarzik/pong