Merge branch 'master' into weblate-merge-tmp

This commit is contained in:
Weblate 2018-05-25 00:21:23 +02:00
commit 51e3625ec8

Diff Content Not Available