10813: Merge branch 'master' into 10813-arv-put-six-threads
authorLucas Di Pentima <lucas@curoverse.com>
Mon, 30 Jan 2017 21:29:10 +0000 (18:29 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Mon, 30 Jan 2017 21:29:10 +0000 (18:29 -0300)

Trivial merge