Sync with master's implementation of Agent.
Merge branch 'master' of https://github.com/lafferty/cshv3