upgraded magit and cl-lib