Evaluate mhatta fork changes
I've heard reports that mhatta fixed the serious breakage that's in trunk (see other tickets) but last time I skimmed the changes, I didn't see anything that directly addressed the known problems. If the fork does work, I'm very confused why.
Carefully review and test the changes, see if there's anything that should be bought back.