Merge proposals

Norm Happ has no merge proposals.