cl-lib functions as cl.el is deprecated
Merge branch 'master' into read-encoding

Conflicts:
	es-mode.el