More work on bug #8298.
Merge branch 'master' of github.com:hugllc/HUGnetLab