Merge branch 'master' into tintou/i18n
authorRoeland Jago Douma <rullzer@users.noreply.github.com>
Fri, 12 Apr 2019 11:48:19 +0000 (13:48 +0200)
committerGitHub <noreply@github.com>
Fri, 12 Apr 2019 11:48:19 +0000 (13:48 +0200)

Trivial merge