Merge proposals

r.friedman has no merge proposals.