Merge "Remove dict comprehension for Python 2.6 support"