5737: Merge branch 'master' into 5737-ruby231
authorLucas Di Pentima <lucas@curoverse.com>
Thu, 1 Dec 2016 19:34:10 +0000 (16:34 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Thu, 1 Dec 2016 19:34:10 +0000 (16:34 -0300)

Trivial merge