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

Trivial merge