Don't crash when killing a polymorphed hydra.
Merge branch 'master' of gitorious.org:crawl/crawl