Merge branch 'master' into feature/exclude-header-in-org

Conflicts:
	es-mode.el