merged el changes from svn trunk