Merge remote-tracking branch 'upstream/master' into HEAD
Modified keyconfig C-k / M-k

Conflicts:
	helm.el
Merge branch 'detach-recover'

Conflicts:
	helm.el