Merge branch 'master' into autotools-conversion
authorJon Trulson <jon@radscan.com>
Mon, 23 Mar 2020 18:55:32 +0000 (12:55 -0600)
committerJon Trulson <jon@radscan.com>
Mon, 23 Mar 2020 18:55:32 +0000 (12:55 -0600)

Trivial merge