Merge branch 'tarsius/cl-lib'

Conflicts:
	magit-svn.el
	magit.el
Merge branch 'master' into next

Conflicts:
	magit-svn.el
	magit.el