Merge branch 'master' into utf8-conversion
authorJon Trulson <jon@radscan.com>
Thu, 8 Nov 2018 21:51:46 +0000 (14:51 -0700)
committerJon Trulson <jon@radscan.com>
Thu, 8 Nov 2018 21:51:46 +0000 (14:51 -0700)

Trivial merge