Merge proposals

Stierlitz has no merge proposals.