Merge branch '9996-stop-on-error'
authorTom Clegg <tom@curoverse.com>
Thu, 8 Sep 2016 21:06:58 +0000 (17:06 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 8 Sep 2016 21:06:58 +0000 (17:06 -0400)
closes #9996


Trivial merge