Merge branch 'master' into autotools-conversion
authorJon Trulson <jon@radscan.com>
Sun, 15 Dec 2019 22:18:41 +0000 (15:18 -0700)
committerJon Trulson <jon@radscan.com>
Sun, 15 Dec 2019 22:18:41 +0000 (15:18 -0700)

Trivial merge