Merge. v1.6.0
authorCarl Hetherington <cth@carlh.net>
Sun, 3 Oct 2021 20:31:18 +0000 (22:31 +0200)
committerCarl Hetherington <cth@carlh.net>
Sun, 3 Oct 2021 20:31:18 +0000 (22:31 +0200)

Trivial merge