Rebase from upstream
Merge branch 'master' into zsh_no_source