Work on bug #7771.  This should fix it, but it will need more testing.
Merge branch 'master' of github.com:hugllc/HUGnetLib