Merge proposals

Stropa has no merge proposals.