Merge "Use Python 2.6.x compatible syntax for dict comprehension"