Attempt to make shove display the correct killer.
Merge remote-tracking branch 'origin/master'