Even better handling of killed shells
Merge branch 'master' into macro_breakpoints