Merge branch 'master' into cde-next
authorJon Trulson <jon@radscan.com>
Sun, 4 Nov 2018 17:56:04 +0000 (10:56 -0700)
committerJon Trulson <jon@radscan.com>
Sun, 4 Nov 2018 17:56:04 +0000 (10:56 -0700)

Trivial merge