5737: Merge branch 'master' into 5737-ruby231
authorLucas Di Pentima <lucas@curoverse.com>
Tue, 29 Nov 2016 15:52:05 +0000 (12:52 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Tue, 29 Nov 2016 15:52:05 +0000 (12:52 -0300)

Trivial merge