Prevent "stop" action from picking up dead process IDs
Merge remote-tracking branch 'kamino/master'