Merge branch 'refs/heads/master' into oh-my-zsh-integration