Merge proposals

hlins in Ubuntu has no merge proposals.