Merge proposals

Christian Loos has no merge proposals.