Merge branch '10151-cwl-dir-listing' closes #10151
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 29 Sep 2016 14:31:08 +0000 (10:31 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 29 Sep 2016 14:31:08 +0000 (10:31 -0400)

Trivial merge