Please don't squash the commits in this MR, otherwise git rebase on Weblate will fail.
Fixes #383 (closed).