Merge proposals

nihstro in Ubuntu has no merge proposals.