zsh: Change 'sudo -s' to 'sudo -i'
Merge branch 'master' into glue