Merge tag '20200524.04' into develop
authorCraig Maloney <craig@decafbad.net>
Sun, 24 May 2020 13:39:12 +0000 (09:39 -0400)
committerCraig Maloney <craig@decafbad.net>
Sun, 24 May 2020 13:39:12 +0000 (09:39 -0400)
Name fixes


Trivial merge