Merge branch 'origin/develop' into Weblate.

pull/21833/head
Weblate 2019-05-24 14:24:30 +00:00
commit deaf81e07b
7 changed files with 175 additions and 60 deletions