Add death
Merge branch 'master' into editor-login-merge