Merge branch 'develop' into config/benchmark
authorMark Felder <feld@FreeBSD.org>
Thu, 19 Dec 2019 18:16:33 +0000 (12:16 -0600)
committerMark Felder <feld@FreeBSD.org>
Thu, 19 Dec 2019 18:16:33 +0000 (12:16 -0600)

Trivial merge