Merge proposals

parent-mode-el in Ubuntu has no merge proposals.