Merge proposals

Dennis has no merge proposals.