Merge 'upstream/master'

Conflicts:
	themes/agnoster.zsh-theme