Merge proposals

Andreas Degert has no merge proposals.