Fix the root user being declared twice.
Merge branch 'master' into fix-build-issues

* master: