Merge proposals

Shinger has no merge proposals.