Merge tag 'upstream/2.5'
authorRafael Laboissière <rafael@debian.org>
Fri, 10 Dec 2021 18:12:15 +0000 (15:12 -0300)
committerRafael Laboissière <rafael@debian.org>
Fri, 10 Dec 2021 18:12:15 +0000 (15:12 -0300)
Upstream version 2.5


Trivial merge