Merge tag '20200112' into develop
authorCraig Maloney <craig@decafbad.net>
Sun, 12 Jan 2020 18:23:50 +0000 (13:23 -0500)
committerCraig Maloney <craig@decafbad.net>
Sun, 12 Jan 2020 18:23:50 +0000 (13:23 -0500)
Finished editing.


Trivial merge