Merge branch 'master' into 10215-arvados-cwl-runner-version
authorradhika <radhika@curoverse.com>
Tue, 6 Dec 2016 18:57:55 +0000 (13:57 -0500)
committerradhika <radhika@curoverse.com>
Tue, 6 Dec 2016 18:57:55 +0000 (13:57 -0500)

Trivial merge