Merge proposals

Bernhard Wraase has no merge proposals.