Merge proposals

Nicotine+ has no merge proposals.