Merge branch 'release-0.86.1'
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Fri, 30 Jul 2021 10:58:26 +0000 (12:58 +0200)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Fri, 30 Jul 2021 10:58:26 +0000 (12:58 +0200)

Trivial merge