Merge branch 'master' into 12479-wb-structured-vocabulary
authorLucas Di Pentima <ldipentima@veritasgenetics.com>
Wed, 20 Dec 2017 22:24:45 +0000 (19:24 -0300)
committerLucas Di Pentima <ldipentima@veritasgenetics.com>
Wed, 20 Dec 2017 22:24:45 +0000 (19:24 -0300)
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>


Trivial merge