Fix old root password
Merge branch 'master' into unit