Merge proposals

cjk in Ubuntu has no merge proposals.