Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-12-06 14:55:28 +01:00
commit 16b7a5f0fb