This is odd...
Merge pull request #1 from TrailHacker/master

Syncing with upstream.