Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/correction.zsh
add special stuff to custom