Merge branch 'origin/master' into Weblate
authorHosted Weblate <hosted@weblate.org>
Fri, 5 Oct 2018 17:33:13 +0000 (19:33 +0200)
committerHosted Weblate <hosted@weblate.org>
Fri, 5 Oct 2018 17:33:13 +0000 (19:33 +0200)

Trivial merge