Alex, I think the dictionary implementation is ready to pull, it has been running overnight.

I think it's pretty low-risk (dictionaries don't happen unless you explicitly configure them), but if this doesn't make it into 1.3, there are two bug fixes we should separately bring into the release (16779b66a573beb8b200470687a7c9dc6dc1d220 and 0ea5fb6b83c7239d72e2016ab251b92c250cdaa5).