Merge branch 'develop' into refactor/notification_settings
authorMark Felder <feld@FreeBSD.org>
Fri, 26 Jun 2020 15:23:19 +0000 (10:23 -0500)
committerMark Felder <feld@FreeBSD.org>
Fri, 26 Jun 2020 15:23:19 +0000 (10:23 -0500)

Trivial merge