Merge branch 'master' of ssh://git.code.sf.net/p/feistymeow/trunk into dev
authorChris Koeritz <fred@gruntose.com>
Mon, 1 Jun 2020 16:34:34 +0000 (16:34 +0000)
committerChris Koeritz <fred@gruntose.com>
Mon, 1 Jun 2020 16:34:34 +0000 (16:34 +0000)

Trivial merge