Zshell updates.
Merge branch 'master' into home