Merge branch 'master' into 8654-arv-jobs-cwl-runner
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 31 Mar 2016 14:32:09 +0000 (10:32 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 31 Mar 2016 14:32:09 +0000 (10:32 -0400)

Trivial merge