10315: Merge branch 'master' into 10315-new-arv-put-performance
authorLucas Di Pentima <lucas@curoverse.com>
Fri, 28 Oct 2016 18:35:19 +0000 (15:35 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Fri, 28 Oct 2016 18:35:19 +0000 (15:35 -0300)

Trivial merge