diff --git a/.htaccess b/.htaccess
index c0f1458..c72dfe4 100644
--- a/.htaccess
+++ b/.htaccess
@@ -104,7 +104,7 @@ DirectoryIndex index.php index.html index.htm
   #
   # If your site is running in a VirtualDocumentRoot at http://example.com/,
   # uncomment the following line:
-  # RewriteBase /
+  RewriteBase /
 
   # Redirect common PHP files to their new locations.
   RewriteCond %{REQUEST_URI} ^(.*)?/(update.php) [OR]
diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module
index 9266911..eb8503f 100644
--- a/core/modules/editor/editor.module
+++ b/core/modules/editor/editor.module
@@ -154,7 +154,7 @@ function editor_form_filter_format_form_alter(&$form, &$form_state) {
   if ($editor) {
     $plugin = $manager->createInstance($editor->editor);
     $settings_form = array();
-    $settings_form['#element_validate'][] = array($plugin, 'settingsFormValidate');
+    $settings_form['#element_validate'][] = array(clone($plugin), 'settingsFormValidate');
     $form['editor']['settings']['subform'] = $plugin->settingsForm($settings_form, $form_state, $editor);
     $form['editor']['settings']['subform']['#parents'] = array('editor', 'settings');
     $form['actions']['submit']['#submit'][] = array($plugin, 'settingsFormSubmit');