Merge proposals

Guido Nickels has no merge proposals.