Merge branch 'master' into 7478-anm-spot-instances
authorLucas Di Pentima <ldipentima@veritasgenetics.com>
Mon, 4 Jun 2018 13:21:26 +0000 (10:21 -0300)
committerLucas Di Pentima <ldipentima@veritasgenetics.com>
Mon, 4 Jun 2018 13:21:26 +0000 (10:21 -0300)
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>


Trivial merge