Merge branch 'devel'
authorJonathan Dieter <jdieter@gmail.com>
Fri, 12 Nov 2021 21:30:55 +0000 (21:30 +0000)
committerJonathan Dieter <jdieter@gmail.com>
Fri, 12 Nov 2021 21:30:55 +0000 (21:30 +0000)

Trivial merge