Merge pull request #42 from fother/trolls
Merge remote-tracking branch 'tmworigclient/master' into dungeon