Work on bug #8400
Merge branch 'master' of github.com:hugllc/HUGnetLib