Merge branch 'master' into netbsd-support netbsd-support
authorng0 <ng0@n0.is>
Mon, 2 Dec 2019 17:34:07 +0000 (17:34 +0000)
committerng0 <ng0@n0.is>
Mon, 2 Dec 2019 17:34:07 +0000 (17:34 +0000)

Trivial merge