Merge "Replace six.iteritems with dict.items"