Merge branch 'origin/develop' into Weblate.

This commit is contained in:
Weblate 2020-01-24 22:47:37 +00:00
commit 1bbb104600