Merge branch '10497-cwl-better-errors' refs #10497
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 28 Dec 2016 15:30:24 +0000 (10:30 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 28 Dec 2016 15:30:24 +0000 (10:30 -0500)

Trivial merge