WOrk on bug #7830.
Merge branch 'master' of github.com:hugllc/HUGnetLib