Merge proposals

Chris St. Pierre has no merge proposals.