This line doesn't work on unix.
Merge branch 'master' into zsh_update