Merge pull request #5002 from msva/zsh-5.4.2