diff --git a/components/grid.inc b/components/grid.inc
index d72c91e..1ce3819 100644
--- a/components/grid.inc
+++ b/components/grid.inc
@@ -22,6 +22,7 @@ function _webform_defaults_grid() {
     'extra' => array(
       'options' => '',
       'questions' => '',
+      'multiple' => 0,
       'optrand' => 0,
       'qrand' => 0,
       'unique' => 0,
@@ -134,7 +135,13 @@ function _webform_edit_grid($component) {
     );
   }
 
-
+  $form['extra']['multiple'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Multigrid'),
+    '#default_value' => $component['extra']['multiple'],
+    '#description' => t('Check this option if the user should be allowed to choose multiple values (checkboxes) for each grid question'),
+    '#weight' => 0,
+  );
   $form['display']['optrand'] = array(
     '#type' => 'checkbox',
     '#title' => t('Randomize Options'),
@@ -185,6 +192,7 @@ function _webform_render_grid($component, $value = NULL, $filter = TRUE) {
     '#description' => $filter ? webform_filter_descriptions($component['extra']['description'], $node) : $component['extra']['description'],
     '#grid_questions' => $questions,
     '#grid_options' => $options,
+    '#multiple' => $component['extra']['multiple'],
     '#default_value' => isset($value) || !strlen($component['value']) ? $value : array_fill_keys(array_keys($questions), $component['value']),
     '#grid_default' => $component['value'],
     '#optrand' => $component['extra']['optrand'],
@@ -220,28 +228,54 @@ function webform_expand_grid($element) {
 
   foreach ($questions as $key => $question) {
     if ($question != '') {
-      $element[$key] = array(
-        '#title' => $question,
-        '#required' => $element['#required'],
-        '#options' => $options,
-        '#type' => 'radios',
-        '#process' => array('form_process_radios', 'webform_expand_select_ids'),
-
-        // Webform handles validation manually.
-        '#validated' => TRUE,
-        '#webform_validated' => FALSE,
-        '#translatable' => array('title'),
-      );
+      if (!empty($element['#multiple'])) {
+        // Set display as a checkbox set.
+        $element[$key] = array(
+          '#id' => $element['#id'].'-'.str_replace('_', '-', _webform_safe_name(strip_tags($question))),
+          '#title' => $question,
+          '#required' => $element['#required'],
+          '#options' => $options,
+          '#type' => 'checkboxes',
+          '#process' => array('form_process_checkboxes', 'webform_expand_select_ids'),
+
+          // Webform handles validation manually.
+          '#validated' => TRUE,
+          '#webform_validated' => FALSE,
+          '#translatable' => array('title'),
+        );
+      }
+      else {
+        $element[$key] = array(
+          '#title' => $question,
+          '#required' => $element['#required'],
+          '#options' => $options,
+          '#type' => 'radios',
+          '#process' => array('form_process_radios', 'webform_expand_select_ids'),
+
+          // Webform handles validation manually.
+          '#validated' => TRUE,
+          '#webform_validated' => FALSE,
+          '#translatable' => array('title'),
+        );
+      }
     }
   }
 
   $value = isset($element['#default_value']) ? $element['#default_value'] : array();
   foreach (element_children($element) as $key) {
     if (isset($value[$key])) {
-      $element[$key]['#default_value'] = ($value[$key] !== '') ? $value[$key] : NULL;
+      if (!empty($element['#multiple'])) {
+        $values_array = drupal_map_assoc(unserialize($value[$key]));
+        $element[$key]['#default_value'] = ($value[$key] !== '') ? $values_array : FALSE;
+      }
+      else {
+        $element[$key]['#default_value'] = ($value[$key] !== '') ? $value[$key] : FALSE;
+      }
     }
     else {
-      $element[$key]['#default_value'] = NULL;
+      if (empty($element['#multiple'])) {
+        $element[$key]['#default_value'] = FALSE;
+      }
     }
   }
 
@@ -274,7 +308,7 @@ function _webform_display_grid($component, $value, $format = 'html') {
     if ($question !== '') {
       $element[$key] = array(
         '#title' => $question,
-        '#value' => isset($value[$key]) ? $value[$key] : NULL,
+        '#value' => isset($value[$key]) ? (!empty($component['extra']['multiple']) && $value[$key] !== FALSE ? unserialize($value[$key]) : $value[$key]) : NULL,
         '#translatable' => array('#title', '#value'),
       );
     }
@@ -298,18 +332,38 @@ function theme_webform_display_grid($variables) {
     foreach ($element['#grid_options'] as $option) {
       $header[] = array('data' => webform_filter_xss($option), 'class' => array('checkbox', 'webform-grid-option'));
     }
-    foreach ($element['#grid_questions'] as $question_key => $question) {
-      $row = array();
-      $row[] = array('data' => webform_filter_xss($question), 'class' => array('webform-grid-question'));
-      foreach ($element['#grid_options'] as $option_value => $option_label) {
-        if (strcmp($element[$question_key]['#value'], $option_value) == 0) {
-          $row[] = array('data' => '<strong>X</strong>', 'class' => array('checkbox', 'webform-grid-option'));
-        }
-        else {
-          $row[] = array('data' => '&nbsp;', 'class' => array('checkbox', 'webform-grid-option'));
+    if (!empty($component['extra']['multiple'])) {
+      // Display multigrid with checkboxes.
+      foreach (element_children($element) as $key) {
+        $row = array();
+        $row[] = array('data' => _webform_filter_xss($element[$key]['#title']), 'class' => 'webform-grid-question');
+        $submitted_values = $element[$key]['#value'];
+        foreach ($element['#grid_options'] as $option_value => $option_label) {
+          if (is_array($submitted_values) && in_array($option_value, $submitted_values)) {
+            $row[] = array('data' => '<strong>X</strong>', 'class' => 'checkbox webform-grid-option');
+          }
+          else {
+            $row[] = array('data' => '&nbsp;', 'class' => 'checkbox webform-grid-option');
+          }
         }
+        $rows[] = $row;
+      }
+    }
+    else {
+      // Display grid with radio buttons.
+      foreach (element_children($element) as $key) {
+        $row = array();
+        $row[] = array('data' => _webform_filter_xss($element[$key]['#title']), 'class' => 'webform-grid-question');
+        foreach ($element['#grid_options'] as $option_value => $option_label) {
+          if (strcmp($option_value, $element[$key]['#value']) == 0) {
+            $row[] = array('data' => '<strong>X</strong>', 'class' => 'checkbox webform-grid-option');
+          }
+          else {
+            $row[] = array('data' => '&nbsp;', 'class' => 'checkbox webform-grid-option');
+          }
+         }
+        $rows[] = $row;
       }
-      $rows[] = $row;
     }
 
     $option_count = count($header) - 1;
@@ -327,6 +381,54 @@ function theme_webform_display_grid($variables) {
 }
 
 /**
+  * Implements _webform_submit_component().
+  *
+  * Convert FAPI 0/1 values into something saveable.
+  */
+function _webform_submit_grid($component, $value) {
+  // For grid with radio buttons, return $value without processing.
+  if (empty($component['extra']['multiple'])) {
+    return $value;
+    }
+
+  // Build a list of all valid keys expected to be submitted.
+  $options = _webform_select_options_from_text($component['extra']['options'], TRUE);
+
+  $return = NULL;
+  if (is_array($value)) {
+    $return = array();
+    foreach ($value as $key => $option_array) {
+      // Handle options that are specified options.
+      if (!is_array($option_array)) {
+        $option_array = (array($option_array));
+      }
+
+      foreach ($option_array as $key2 => $option_value) {
+        if ($option_value !== '' && isset($options[$option_value])) {
+          // Checkboxes submit a value of FALSE when unchecked. A checkbox with
+          // a value of '0' is valid, so we can't use empty() here.
+          if ($option_value === FALSE  && !$component['extra']['aslist'] && $component['extra']['multiple']) {
+            unset($value[$key2][$option_value]);
+          }
+          else {
+            $return[$key][] = $option_value;
+          }
+        }
+      }
+    }
+  }
+  elseif (is_string($value)) {
+    return $value;
+  }
+
+  $return_values = array();
+  foreach ($return as $key => $return_options) {
+    $return_values[$key] = serialize($return_options);
+  }
+  return $return_values;
+}
+
+/**
  * Implements _webform_analysis_component().
  */
 function _webform_analysis_grid($component, $sids = array()) {
@@ -342,10 +444,13 @@ function _webform_analysis_grid($component, $sids = array()) {
     ->fields('wsd', array('no', 'data'))
     ->condition('nid', $component['nid'])
     ->condition('cid', $component['cid'])
-    ->condition('data', '', '<>')
-    ->groupBy('no')
-    ->groupBy('data');
-  $query->addExpression('COUNT(sid)', 'datacount');
+    ->condition('data', '', '<>');
+
+  if(empty($component['extra']['multiple'])) {
+    $query->groupBy('no')
+      ->groupBy('data')
+      ->addExpression('COUNT(sid)', 'datacount');
+  }
 
   if (count($sids)) {
     $query->condition('sid', $sids, 'IN');
@@ -353,8 +458,21 @@ function _webform_analysis_grid($component, $sids = array()) {
 
   $result = $query->execute();
   $counts = array();
-  foreach ($result as $data) {
-    $counts[$data->no][$data->data] = $data->datacount;
+
+  if(!empty($component['extra']['multiple'])) {
+    foreach ($result as $data) {
+      $selections = unserialize($data->data);
+      foreach($selections as $option) {
+        if(!isset($counts[$data->no][$option])) {
+          $counts[$data->no][$option] = 0;
+        }
+        $counts[$data->no][$option] += 1;
+      }
+    }
+  } else {
+    foreach ($result as $data) {
+      $counts[$data->no][$data->data] = $data->datacount;
+    }
   }
 
   // Create an entire table to be put into the returned row.
@@ -392,10 +510,29 @@ function _webform_table_grid($component, $value) {
   $options = _webform_select_replace_tokens($options, $node);
 
   $output = '';
-  // Set the value as a single string.
-  foreach ($questions as $key => $label) {
-    if (isset($value[$key]) && isset($options[$value[$key]])) {
-      $output .= webform_filter_xss($label) . ': ' . webform_filter_xss($options[$value[$key]]) . '<br />';
+  if (!empty($component['extra']['multiple'])) {
+    // Display multigrid.
+    foreach ($questions as $key => $label) {
+      $row = array();
+      if(isset($value[$key])) {
+        $values = unserialize($value[$key]);
+        foreach ($options as $okey => $option) {
+          if (in_array($okey, $values)) {
+            $row[] = $option;
+          }
+        }
+      } else {
+        $row[] = '';
+      }
+      $output .= _webform_filter_xss($label) . ': ' . _webform_filter_xss(implode(', ', $row)) . '<br />';
+    }
+  }
+  else {
+    // Set the value as a single string.
+    foreach ($questions as $key => $label) {
+      if (isset($value[$key]) && isset($options[$value[$key]])) {
+        $output .= _webform_filter_xss($label) . ': ' . _webform_filter_xss($options[$value[$key]]) . '<br />';
+      }
     }
   }
 
@@ -412,17 +549,35 @@ function _webform_csv_headers_grid($component, $export_options) {
 
   $header = array();
   $header[0] = array('');
-  $header[1] = array($export_options['header_keys'] ? $component['form_key'] : $component['name']);
-  $count = 0;
-  foreach ($items as $key => $item) {
-    // Empty column per sub-field in main header.
-    if ($count != 0) {
-      $header[0][] = '';
-      $header[1][] = '';
+   $items = _webform_select_options_from_text($component['extra']['questions'], TRUE);
+  $options = _webform_select_options_from_text($component['extra']['options'], TRUE);
+  if (!empty($component['extra']['multiple'])) {
+    $header[1] = array();
+    foreach ($items as $key => $item) {
+      $count = 0;
+      foreach ($options as $key2 => $option) {
+        // Empty column per sub-field in main header.
+        $header[0][] = '';
+        $header[1][] = ($count == 0 ? $item : '');
+        // The value for this option.
+        $header[2][] = $option;
+        $count++;
+      }
     }
-    // The value for this option.
-    $header[2][] = $export_options['header_keys'] ? $key : $item;
-    $count++;
+  }
+  else {
+    $header[1] = array($component['name']);
+    $count = 0;
+    foreach ($items as $key => $item) {
+      // Empty column per sub-field in main header.
+      if ($count != 0) {
+        $header[0][] = '';
+        $header[1][] = '';
+      }
+      // The value for this option.
+      $header[2][] = $item;
+      $count++;
+     }
   }
 
   return $header;
@@ -439,12 +594,28 @@ function _webform_csv_data_grid($component, $export_options, $value) {
   $options = _webform_select_replace_tokens($options, $node);
 
   $return = array();
-  foreach ($questions as $key => $question) {
-    if (isset($value[$key]) && isset($options[$value[$key]])) {
-      $return[] = $export_options['select_keys'] ? $value[$key] : $options[$value[$key]];
-    }
-    else {
-      $return[] = '';
+  if (!empty($component['extra']['multiple'])) {
+    foreach ($questions as $key => $question) {
+      foreach ($options as $key2 => $option) {
+        $value_temp = unserialize($value[$key]);
+        $values_array = is_array($value_temp) ? drupal_map_assoc($value_temp) : array();
+        if (isset($values_array[$key2]) && isset($options[$values_array[$key2]])) {
+          $return[] = $export_options['select_keys'] ? $values_array[$key2] : 'X';
+        }
+        else {
+          $return[] = '';
+        }
+      }
+     }
+  }
+  else {
+    foreach ($questions as $key => $question) {
+      if (isset($value[$key]) && isset($options[$value[$key]])) {
+        $return[] = $export_options['select_keys'] ? $value[$key] : $options[$value[$key]];
+      }
+      else {
+        $return[] = '';
+      }
     }
   }
   return $return;
@@ -490,12 +661,24 @@ function theme_webform_grid($variables) {
     // Create a row with the question title.
     $row = array(array('data' => webform_filter_xss($question_element['#title']), 'class' => array('webform-grid-question')));
 
-    // Render each radio button in the row.
-    $radios = form_process_radios($question_element);
-    foreach (element_children($radios) as $key) {
-      $radios[$key]['#title'] = $question_element['#title'] . ' - ' . $radios[$key]['#title'];
-      $radios[$key]['#title_display'] = 'invisible';
-      $row[] = array('data' => drupal_render($radios[$key]), 'class' => array('checkbox', 'webform-grid-option'));
+    if (!empty($element['#multiple'])) {
+
+      // Render each checkbox in the row.
+      $checkboxes = form_process_checkboxes($question_element);
+      foreach (element_children($checkboxes) as $key) {
+        $checkboxes[$key]['#title'] = $question_element['#title'] . ' - ' . $checkboxes[$key]['#title'];
+        $checkboxes[$key]['#title_display'] = 'invisible';
+        $row[] = array('data' => drupal_render($checkboxes[$key]), 'class' => array('checkbox', 'webform-grid-option'));
+      }
+    }
+    else {
+      // Render each radio button in the row.
+      $radios = form_process_radios($question_element);
+      foreach (element_children($radios) as $key) {
+        $radios[$key]['#title'] = $question_element['#title'] . ' - ' . $radios[$key]['#title'];
+        $radios[$key]['#title_display'] = 'invisible';
+        $row[] = array('data' => drupal_render($radios[$key]), 'class' => array('checkbox', 'webform-grid-option'));
+      }
     }
     $rows[] = $row;
   }