Merge proposals

zhcon in Ubuntu has no merge proposals.