Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-12-08 15:52:56 +01:00
commit e080997aca