Merge remote-tracking branch 'mainline/master' into hashier
Merge branch 'hashier' of github.com:hashier/oh-my-zsh into hashier