Merge branch 'develop' into fix/deprecation-warning-welcome-message
authorMark Felder <feld@FreeBSD.org>
Fri, 25 Sep 2020 15:48:01 +0000 (10:48 -0500)
committerMark Felder <feld@FreeBSD.org>
Fri, 25 Sep 2020 15:48:01 +0000 (10:48 -0500)

Trivial merge