Merge branch '9570-cwl-v1.0' closes #9570
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 13 Jul 2016 16:49:57 +0000 (12:49 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 13 Jul 2016 16:49:57 +0000 (12:49 -0400)

Trivial merge