synchronize with mrbob.bobexceptions merged pull request