This fixes #7958.
Merge branch 'master' of github.com:hugllc/HUGnetLab

Conflicts:
	html/HUGnetLab/template/default/templates.devices.php