Merge proposals

linux-man has no merge proposals.