Merge branch 'master' into fixes-1187
authorCamila Ayres <hello@camila.codes>
Mon, 22 Jul 2019 18:45:50 +0000 (20:45 +0200)
committerGitHub <noreply@github.com>
Mon, 22 Jul 2019 18:45:50 +0000 (20:45 +0200)

Trivial merge