Merge proposals

emacsen-common in Ubuntu has no merge proposals.