Merge branch 'master' into autotools-conversion
authorJon Trulson <jon@radscan.com>
Sun, 1 Dec 2019 20:31:21 +0000 (13:31 -0700)
committerJon Trulson <jon@radscan.com>
Sun, 1 Dec 2019 20:31:21 +0000 (13:31 -0700)

Trivial merge