Fixed a race condition that only appeared in high traffic scenarios.
Merge branch 'master' of https://github.com/cavedude00/Server