Merge branch 'master' into 14930-arvput-trash-at
authorLucas Di Pentima <ldipentima@veritasgenetics.com>
Mon, 10 Jun 2019 23:15:23 +0000 (20:15 -0300)
committerLucas Di Pentima <ldipentima@veritasgenetics.com>
Mon, 10 Jun 2019 23:15:23 +0000 (20:15 -0300)
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>


Trivial merge