Update and prepare for merge with zsh repo