Update edl branch

Update edl branch before it drifts too far away.