Merge branch 'master' into utf8-conversion, after 2.3.0a release
authorJon Trulson <jon@radscan.com>
Sun, 13 Oct 2019 01:17:42 +0000 (19:17 -0600)
committerJon Trulson <jon@radscan.com>
Sun, 13 Oct 2019 01:17:42 +0000 (19:17 -0600)

Trivial merge