diff -u b/composer.json b/composer.json
--- b/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
     "mikey179/vfsStream": "1.*",
     "stack/builder": "1.0.*",
     "egulias/email-validator": "1.2.*",
-    "masterminds/html5": "2.*"
+    "masterminds/html5": "dev-master"
   },
   "autoload": {
     "psr-4": {
diff -u b/composer.lock b/composer.lock
--- b/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "f42dce2268b1a6fcf8ffc8720c45f28f",
+    "hash": "38a1b76a4048e05502ddd122630dff3f",
     "packages": [
         {
             "name": "doctrine/annotations",
@@ -726,16 +726,16 @@
         },
         {
             "name": "masterminds/html5",
-            "version": "2.0.1",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Masterminds/html5-php.git",
-                "reference": "e1e579a69254e8e20d6270b5c13c4475f8461438"
+                "reference": "b39dd885966dea2d3d33509af505f4ecef2f6343"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/e1e579a69254e8e20d6270b5c13c4475f8461438",
-                "reference": "e1e579a69254e8e20d6270b5c13c4475f8461438",
+                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/b39dd885966dea2d3d33509af505f4ecef2f6343",
+                "reference": "b39dd885966dea2d3d33509af505f4ecef2f6343",
                 "shasum": ""
             },
             "require": {
@@ -787,7 +787,7 @@
                 "serializer",
                 "xml"
             ],
-            "time": "2014-09-23 09:49:02"
+            "time": "2014-12-02 02:51:14"
         },
         {
             "name": "mikey179/vfsStream",
@@ -2590,7 +2590,8 @@
     "minimum-stability": "stable",
     "stability-flags": {
         "doctrine/common": 20,
-        "phpunit/phpunit-mock-objects": 20
+        "phpunit/phpunit-mock-objects": 20,
+        "masterminds/html5": 20
     },
     "prefer-stable": false,
     "platform": {
diff -u b/core/modules/filter/filter.module b/core/modules/filter/filter.module
--- b/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -457,13 +457,12 @@
   $text = Xss::filter($text, $allowed_tags);
 
   if ($filter->settings['filter_html_nofollow']) {
-    $html5 = new HTML5();
-    $html_dom = $html5->loadHTML($text);
+    $html_dom = Html::load($text);
     $links = $html_dom->getElementsByTagName('a');
     foreach ($links as $link) {
       $link->setAttribute('rel', 'nofollow');
     }
-    $text = $html5->saveHTML($html_dom);
+    $text = Html::serialize($html_dom);
   }
 
   return trim($text);
@@ -491,12 +490,13 @@
   $text = Xss::filter($text, $allowed_tags);
 
   if ($filter->settings['filter_html_nofollow']) {
-    $html_dom = Html::load($text);
+    $html5 = new HTML5();
+    $html_dom = $html5->loadHTML($text);
     $links = $html_dom->getElementsByTagName('a');
     foreach ($links as $link) {
       $link->setAttribute('rel', 'nofollow');
     }
-    $text = Html::serialize($html_dom);
+    $text = $html5->saveHTML($html_dom);
   }
 
   return trim($text);
reverted:
--- b/core/vendor/composer/autoload_classmap.php
+++ a/core/vendor/composer/autoload_classmap.php
@@ -87,12 +87,9 @@
     'PHPUnit_Framework_MockObject_Matcher' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher.php',
     'PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyInvokedCount.php',
     'PHPUnit_Framework_MockObject_Matcher_AnyParameters' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyParameters.php',
-    'PHPUnit_Framework_MockObject_Matcher_ConsecutiveParameters' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/ConsecutiveParameters.php',
     'PHPUnit_Framework_MockObject_Matcher_Invocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Invocation.php',
     'PHPUnit_Framework_MockObject_Matcher_InvokedAtIndex' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtIndex.php',
-    'PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastCount' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtLeastCount.php',
     'PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastOnce' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtLeastOnce.php',
-    'PHPUnit_Framework_MockObject_Matcher_InvokedAtMostCount' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtMostCount.php',
     'PHPUnit_Framework_MockObject_Matcher_InvokedCount' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedCount.php',
     'PHPUnit_Framework_MockObject_Matcher_InvokedRecorder' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedRecorder.php',
     'PHPUnit_Framework_MockObject_Matcher_MethodName' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/MethodName.php',