Merge branch 'develop' into proxy-error
authorMark Felder <feld@FreeBSD.org>
Tue, 9 Jul 2019 15:18:30 +0000 (10:18 -0500)
committerMark Felder <feld@FreeBSD.org>
Tue, 9 Jul 2019 15:18:30 +0000 (10:18 -0500)

Trivial merge