Merge remote-tracking branch 'upstream/master'

Merge in latest oh-my-zsh.