Handle send to port failures better
Merge branch 'master' into macro_breakpoints