Merge "Replace six.iteritems() with .items()"