Revert deletion of gp/sp/pair-on-newline
Update el.mk, merge
Update el.mk, merge