Improved handling of killed shell
Merge branch 'master' into macro_breakpoints