15836: Merge branch 'master'
authorTom Clegg <tom@tomclegg.ca>
Thu, 16 Jan 2020 16:59:39 +0000 (11:59 -0500)
committerTom Clegg <tom@tomclegg.ca>
Thu, 16 Jan 2020 16:59:39 +0000 (11:59 -0500)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>


Trivial merge