More hotfixing
Merge branch 'dev' of https://github.com/kmjungersen/znc_admin into dev
More hotfixing