Fixed bug where raising undead from trolls revives them instead
Merge branch 'master' into develop