Merge branch 'master' into 9369-arv-cwl-docs
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 15 Jul 2016 17:11:49 +0000 (13:11 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 15 Jul 2016 17:11:49 +0000 (13:11 -0400)

Trivial merge