Bug 722727

I did some merging, so you can ignore anything that doesn't start `maxmin-722727`.