13111: Merge branch 'master' into 12308-go-fuse
authorTom Clegg <tclegg@veritasgenetics.com>
Mon, 8 Jan 2018 00:58:07 +0000 (19:58 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Mon, 8 Jan 2018 01:01:21 +0000 (20:01 -0500)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>


Trivial merge