Merge branch 'fontx' into master (final update is interdependent)
authormirabilos <tg@debian.org>
Sun, 25 Oct 2020 01:04:32 +0000 (02:04 +0100)
committermirabilos <mirabilos@evolvis.org>
Sun, 25 Oct 2020 01:04:32 +0000 (02:04 +0100)

Trivial merge