diff --git a/plugins/views_plugin_style.inc b/plugins/views_plugin_style.inc
index 627b9f2..6975aeb 100644
--- a/plugins/views_plugin_style.inc
+++ b/plugins/views_plugin_style.inc
@@ -185,7 +185,7 @@ class views_plugin_style extends views_plugin {
         // Add a form for every grouping, plus one.
         for ($i = 0; $i <= $c; $i++) {
           $grouping = !empty($this->options['grouping'][$i]) ? $this->options['grouping'][$i] : array();
-          $grouping += array('field' => '', 'rendered' => TRUE);
+          $grouping += array('field' => '', 'rendered' => TRUE, 'rendered_strip' => FALSE);
           $form['grouping'][$i]['field'] = array(
             '#type' => 'select',
             '#title' => t('Grouping field Nr.@number', array('@number' => $i + 1)),
@@ -199,6 +199,11 @@ class views_plugin_style extends views_plugin {
             '#default_value' => $grouping['rendered'],
             '#description' => t('If enabled the rendered output of the grouping field is used to group the rows.'),
           );
+          $form['grouping'][$i]['rendered_strip'] = array(
+            '#type' => 'checkbox',
+            '#title' => t('Remove tags from rendered output'),
+            '#default_value' => $grouping['rendered_strip'],
+          );
         }
       }
     }
@@ -384,6 +389,7 @@ class views_plugin_style extends views_plugin {
         foreach ($groupings as $info) {
           $field = $info['field'];
           $rendered = isset($info['rendered']) ? $info['rendered'] : $group_rendered;
+          $rendered_strip = isset($info['rendered_strip']) ? $info['rendered_strip'] : FALSE;
           $grouping = '';
           $group_content = '';
           // Group on the rendered version of the field, not the raw.  That way,
@@ -396,6 +402,9 @@ class views_plugin_style extends views_plugin {
             }
             if ($rendered) {
               $grouping = $group_content;
+              if ($rendered_strip) {
+                $group_content = $grouping = strip_tags(htmlspecialchars_decode($group_content));
+              }
             }
             else {
               $grouping = $this->get_field_value($index, $field);
diff --git a/tests/styles/views_plugin_style.test b/tests/styles/views_plugin_style.test
index 71f6cfa..875fcf1 100644
--- a/tests/styles/views_plugin_style.test
+++ b/tests/styles/views_plugin_style.test
@@ -104,10 +104,15 @@ class ViewsPluginStyleTestCase extends ViewsSqlTest {
     $this->assertEqual($sets_new_value, $expected, t('The style plugins should proper group the results with grouping by the value.'));
   }
 
+  function testGrouping() {
+    $this->_testGrouping(FALSE);
+    $this->_testGrouping(TRUE);
+  }
+
   /**
    * Tests the grouping features of styles.
    */
-  function testGrouping() {
+  function _testGrouping($stripped = FALSE) {
     $view = $this->getBasicView();
     // Setup grouping by the job and the age field.
     $view->init_display();
@@ -176,24 +181,50 @@ class ViewsPluginStyleTestCase extends ViewsSqlTest {
     $expected['Job: Drummer']['rows']['Age: 28']['rows'][2]->views_test_age = '28';
     $expected['Job: Drummer']['rows']['Age: 28']['rows'][2]->views_test_id = '3';
 
+
+    // Alter the results to support the stripped case.
+    if ($stripped) {
+
+      // Add some html to the result and expected value.
+      $rand = '<a data="' . $this->randomName() . '" />';
+      $view->result[0]->views_test_job .= $rand;
+      $expected['Job: Singer']['rows']['Age: 25']['rows'][0]->views_test_job = 'Singer' . $rand;
+      $expected['Job: Singer']['group'] = 'Job: Singer';
+      $rand = '<a data="' . $this->randomName() . '" />';
+      $view->result[1]->views_test_job .= $rand;
+      $expected['Job: Singer']['rows']['Age: 27']['rows'][1]->views_test_job = 'Singer' . $rand;
+      $rand = '<a data="' . $this->randomName() . '" />';
+      $view->result[2]->views_test_job .= $rand;
+      $expected['Job: Drummer']['rows']['Age: 28']['rows'][2]->views_test_job = 'Drummer' . $rand;
+      $expected['Job: Drummer']['group'] = 'Job: Drummer';
+
+      $view->style_plugin->options['grouping'][0] = array('field' => 'job', 'rendered' => TRUE, 'rendered_strip' => TRUE);
+      $view->style_plugin->options['grouping'][1] = array('field' => 'age', 'rendered' => TRUE, 'rendered_strip' => TRUE);
+    }
+
+
     // The newer api passes the value of the grouping as well.
     $sets_new_rendered = $view->style_plugin->render_grouping($view->result, $view->style_plugin->options['grouping'], TRUE);
-    $sets_new_value = $view->style_plugin->render_grouping($view->result, $view->style_plugin->options['grouping'], FALSE);
 
     $this->assertEqual($sets_new_rendered, $expected, t('The style plugins should proper group the results with grouping by the rendered output.'));
 
-    // Reorder the group structure to grouping by value.
-    $expected['Singer'] = $expected['Job: Singer'];
-    $expected['Singer']['rows']['25'] = $expected['Job: Singer']['rows']['Age: 25'];
-    $expected['Singer']['rows']['27'] = $expected['Job: Singer']['rows']['Age: 27'];
-    $expected['Drummer'] = $expected['Job: Drummer'];
-    $expected['Drummer']['rows']['28'] = $expected['Job: Drummer']['rows']['Age: 28'];
-    unset($expected['Job: Singer']);
-    unset($expected['Singer']['rows']['Age: 25']);
-    unset($expected['Singer']['rows']['Age: 27']);
-    unset($expected['Job: Drummer']);
-    unset($expected['Drummer']['rows']['Age: 28']);
-
-    $this->assertEqual($sets_new_value, $expected, t('The style plugins should proper group the results with grouping by the value.'));
+    // Don't test stripped case, because the actual value is not stripped.
+    if (!$stripped) {
+      $sets_new_value = $view->style_plugin->render_grouping($view->result, $view->style_plugin->options['grouping'], FALSE);
+
+      // Reorder the group structure to grouping by value.
+      $expected['Singer'] = $expected['Job: Singer'];
+      $expected['Singer']['rows']['25'] = $expected['Job: Singer']['rows']['Age: 25'];
+      $expected['Singer']['rows']['27'] = $expected['Job: Singer']['rows']['Age: 27'];
+      $expected['Drummer'] = $expected['Job: Drummer'];
+      $expected['Drummer']['rows']['28'] = $expected['Job: Drummer']['rows']['Age: 28'];
+      unset($expected['Job: Singer']);
+      unset($expected['Singer']['rows']['Age: 25']);
+      unset($expected['Singer']['rows']['Age: 27']);
+      unset($expected['Job: Drummer']);
+      unset($expected['Drummer']['rows']['Age: 28']);
+
+      $this->assertEqual($sets_new_value, $expected, t('The style plugins should proper group the results with grouping by the value.'));
+    }
   }
 }