Merge fixes from branch 'stable-1.10'
commit5161a67961bb753e953885cbee74ee5e1e3165fd
authorRoland Lutz <rlutz@hedmen.org>
Fri, 2 Jul 2021 15:01:05 +0000 (2 17:01 +0200)
committerRoland Lutz <rlutz@hedmen.org>
Fri, 2 Jul 2021 15:01:05 +0000 (2 17:01 +0200)
tree3142a9277fbb1d8ad5662f719c50133574d32d56
parente38afa741304ffe17975d835f4e6925f9106c3a1
parent68c2582ea24caef2c6f42d7dcc09f699a60077dd
Merge fixes from branch 'stable-1.10'