Merge branch 'master' into utf8-conversion after 2.3.1 release
authorJon Trulson <jon@radscan.com>
Sat, 16 Nov 2019 23:34:48 +0000 (16:34 -0700)
committerJon Trulson <jon@radscan.com>
Sat, 16 Nov 2019 23:34:48 +0000 (16:34 -0700)

Trivial merge