Merge branch 'master' into tintou/i18n
authorCamila Ayres <smayres@gmail.com>
Thu, 11 Apr 2019 11:54:18 +0000 (13:54 +0200)
committerGitHub <noreply@github.com>
Thu, 11 Apr 2019 11:54:18 +0000 (13:54 +0200)

Trivial merge