Add a fix for clearing potion effects on respawn
Merge remote-tracking branch 'upstream/master'