Merge proposals

Hicks has no merge proposals.