Merge proposals

Christoph Nikic has no merge proposals.