Merge branch 'master' into utf8-conversion
authorJon Trulson <jon@radscan.com>
Tue, 15 Jan 2019 19:02:49 +0000 (12:02 -0700)
committerJon Trulson <jon@radscan.com>
Tue, 15 Jan 2019 19:02:49 +0000 (12:02 -0700)

Trivial merge