Merge branch 'master' into gradle
authorJeanderson Candido <jeandersonbc@gmail.com>
Wed, 20 Jun 2018 02:18:00 +0000 (23:18 -0300)
committerJeanderson Candido <jeandersonbc@gmail.com>
Wed, 20 Jun 2018 02:18:00 +0000 (23:18 -0300)

Trivial merge