Potential fix for golems being cloned and being respawned as humans
Merge remote-tracking branch 'upstream/Bleeding-Edge' into Bleeding-Edge