Merge branch 'origin/master' into Weblate.