Merge proposals

w. glenn oldham has no merge proposals.