Attempt to fix a bug where raising undead from killed trolls revives them instead
Merge branch 'master' into develop
Merge branch 'develop' into tidying