Merge "Bring back Python 2.6 compat (don"t use dict comprehension)"