Merge branch 'master' into utf8-conversion-2
authorJon Trulson <jon@radscan.com>
Mon, 5 Nov 2018 22:52:14 +0000 (15:52 -0700)
committerJon Trulson <jon@radscan.com>
Mon, 5 Nov 2018 22:52:14 +0000 (15:52 -0700)

Trivial merge