changing 'root's host to %
Merge remote-tracking branch 'origin/master'