Merge proposals

treil in Ubuntu has no merge proposals.