Merge remote-tracking branch 'atemu/misc-fixes'
authorJoey Hess <joeyh@joeyh.name>
Fri, 7 May 2021 15:23:54 +0000 (11:23 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 7 May 2021 15:23:54 +0000 (11:23 -0400)

Trivial merge