Merge remote-tracking branch 'weblate/master' into master