Merge branch 'master' into 13369-update-ubuntu1404-dockerfile
authorFernando Monserrat <fernando.monserrat@gmail.com>
Mon, 23 Apr 2018 21:16:44 +0000 (18:16 -0300)
committerFernando Monserrat <fernando.monserrat@gmail.com>
Mon, 23 Apr 2018 21:16:44 +0000 (18:16 -0300)
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat@veritasgenetics.com>


Trivial merge