Merge branch 'master' into 11454-wb-federated-search
authorLucas Di Pentima <ldipentima@veritasgenetics.com>
Tue, 30 Jan 2018 18:29:50 +0000 (15:29 -0300)
committerLucas Di Pentima <ldipentima@veritasgenetics.com>
Tue, 30 Jan 2018 18:29:50 +0000 (15:29 -0300)
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>


Trivial merge