Forgot a '$'
Merge branch 'master' into zsh_update