Merge proposals

r-other-nitpick in Ubuntu has no merge proposals.