Merge proposals

Shane has no merge proposals.