Bugfixed death with stickypad
Merge remote-tracking branch 'origin/master' into StickyDeath