merge dict updates into master.

I accidentally merged into the wrong branch...