12475: Merge branch 'master' into 12475-asyncbuf
authorTom Clegg <tclegg@veritasgenetics.com>
Sat, 25 Nov 2017 07:16:05 +0000 (02:16 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Sat, 25 Nov 2017 07:16:05 +0000 (02:16 -0500)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>


Trivial merge