Merge "Fix Py2.6 dict comprehension SyntaxError."