ZFGCCP/King-of-Thieves — pull request #24 by gm112 (2012-10-02 18:41:40+00:00)
Title: fast forward

keeping sync'd with mainline