Yet another fix for killed shells
Merge branch 'master' into macro_breakpoints