fixed a fatal bug (read: segfault) in Zombie
Merge branch 'local-tests', remote-tracking branch 'origin' into game-alpha