Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2018-05-19 18:22:18 +00:00
commit a06a18a606