Merge ELPA branch.