Merge branch 'master' into utf8-conversion-2
authorJon Trulson <jon@radscan.com>
Wed, 7 Nov 2018 18:24:00 +0000 (11:24 -0700)
committerJon Trulson <jon@radscan.com>
Wed, 7 Nov 2018 18:24:00 +0000 (11:24 -0700)

Trivial merge