10813: Merge branch 'master' into 10813-arv-put-six-threads
authorLucas Di Pentima <lucas@curoverse.com>
Wed, 18 Jan 2017 20:14:01 +0000 (17:14 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Wed, 18 Jan 2017 20:14:01 +0000 (17:14 -0300)

Trivial merge