Merge branch 'master' into 10259-cwl-pipeline-null
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 17 Oct 2016 19:07:09 +0000 (15:07 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 17 Oct 2016 19:07:09 +0000 (15:07 -0400)

Trivial merge