Merge branch 'patch-2' of https://github.com/jrandall/arvados
authorTom Clegg <tclegg@veritasgenetics.com>
Thu, 21 Dec 2017 16:53:26 +0000 (11:53 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Thu, 21 Dec 2017 16:56:03 +0000 (11:56 -0500)
fixes #11621

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>


Trivial merge