Merge proposals

Bernhard W has no merge proposals.