Unique slots
Merge remote-tracking branch 'origin/masterOfAllThatIsEvil' into masterOfAllThatIsEvil
fixes damage trap