drop debugging to show a backtrace on exit
Merge branch 'master', remote branch 'origin'