Merge branch 'master' into cde-next
authorJon Trulson <jon@radscan.com>
Fri, 6 Jul 2018 19:19:33 +0000 (13:19 -0600)
committerJon Trulson <jon@radscan.com>
Fri, 6 Jul 2018 19:19:33 +0000 (13:19 -0600)
Need to resync before folding current cde-next into master.


Trivial merge