Merge branch 'master' into remoteconfig
authorJoey Hess <joeyh@joeyh.name>
Wed, 15 Jan 2020 17:11:20 +0000 (13:11 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 15 Jan 2020 17:11:20 +0000 (13:11 -0400)

Trivial merge