12479: Merge branch 'master' into 12479-wb-structured-vocabulary
authorLucas Di Pentima <ldipentima@veritasgenetics.com>
Mon, 8 Jan 2018 14:44:38 +0000 (11:44 -0300)
committerLucas Di Pentima <ldipentima@veritasgenetics.com>
Mon, 8 Jan 2018 17:40:44 +0000 (14:40 -0300)
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>


Trivial merge