fucking ControlPersist
Merge remote-tracking branch 'origin/master'

Conflicts:
	ssh/config
fucking ControlPersist