diff --git a/core/modules/field/field.module b/core/modules/field/field.module
index 8157971..1bddcf2 100644
--- a/core/modules/field/field.module
+++ b/core/modules/field/field.module
@@ -1071,6 +1071,10 @@ function template_preprocess_field(&$variables, $hook) {
     }
   }
 
+  // Add a boolean to set if the field is multiple to ease the templating of
+  // both multiple and single values.
+  $variables['multiple_items'] = count($variables['items']) > 1;
+
   // Add default CSS classes. Since there can be many fields rendered on a page,
   // save some overhead by calling strtr() directly instead of
   // drupal_html_class().
@@ -1175,6 +1179,7 @@ function template_process_field(&$variables, $hook) {
  *   - content_attributes: A string containing the attributes for the content's
  *     div.
  *   - items: An array of field items.
+ *   - multiple_items: A boolean indicating if the field has multiple values.
  *   - item_attributes: An array of attributes for each item.
  *   - classes: A string containing the classes for the wrapping div.
  *   - attributes: A string containing the attributes for the wrapping div.
@@ -1193,13 +1198,22 @@ function theme_field($variables) {
     $output .= '<div class="field-label"' . $variables['title_attributes'] . '>' . $variables['label'] . ':&nbsp;</div>';
   }
 
-  // Render the items.
-  $output .= '<div class="field-items"' . $variables['content_attributes'] . '>';
+  // Render the items. If the field is not multiple, simplify the output.
+  if($variables['multiple_items']){
+    $output .= '<div class="field-items"' . $variables['content_attributes'] . '>';
+  }
   foreach ($variables['items'] as $delta => $item) {
-    $classes = 'field-item ' . ($delta % 2 ? 'odd' : 'even');
-    $output .= '<div class="' . $classes . '"' . $variables['item_attributes'][$delta] . '>' . drupal_render($item) . '</div>';
+    if($variables['multiple_items']){
+      $classes = 'field-item ' . ($delta % 2 ? 'odd' : 'even');
+      $output .= '<div class="' . $classes . '"' . $variables['item_attributes'][$delta] . '>' . drupal_render($item) . '</div>';
+    }
+    else {
+      $output .= '<div class="" ' . $variables['item_attributes'][$delta] . '>' . drupal_render($item) . '</div>';
+    }
+  }
+  if($variables['multiple_items']){
+    $output .= '</div>';
   }
-  $output .= '</div>';
 
   // Render the top-level DIV.
   $output = '<div ' . $variables['attributes'] . '>' . $output . '</div>';
diff --git a/core/modules/field/theme/field.tpl.php b/core/modules/field/theme/field.tpl.php
index a8ffe32..4c6d6fc 100644
--- a/core/modules/field/theme/field.tpl.php
+++ b/core/modules/field/theme/field.tpl.php
@@ -51,9 +51,17 @@ HTML comment.
   <?php if (!$label_hidden): ?>
     <div class="field-label"<?php print $title_attributes; ?>><?php print $label ?>:&nbsp;</div>
   <?php endif; ?>
-  <div class="field-items"<?php print $content_attributes; ?>>
-    <?php foreach ($items as $delta => $item): ?>
+  <?php if ($multiple_items) : ?>
+    <div class="field-items"<?php print $content_attributes; ?>>
+  <?php endif; ?>
+  <?php foreach ($items as $delta => $item): ?>
+    <?php if ($multiple_items) : ?>
       <div class="field-item <?php print $delta % 2 ? 'odd' : 'even'; ?>"<?php print $item_attributes[$delta]; ?>><?php print render($item); ?></div>
-    <?php endforeach; ?>
-  </div>
+    <?php else: ?>
+        <div <?php print $item_attributes[$delta]; ?>><?php print render($item); ?></div>
+    <?php endif; ?>
+  <?php endforeach; ?>
+  <?php if ($multiple_items) : ?>
+    </div>
+  <?php endif; ?>
 </div>