Merge proposals

Stephan B has no merge proposals.