Merge branch 'master' into 12533-row-lock-contention
authorLucas Di Pentima <ldipentima@veritasgenetics.com>
Thu, 2 Nov 2017 15:54:56 +0000 (12:54 -0300)
committerLucas Di Pentima <ldipentima@veritasgenetics.com>
Thu, 2 Nov 2017 15:54:56 +0000 (12:54 -0300)
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>


Trivial merge