Merge proposals

Thomas Vander Stichele has no merge proposals.