diff --git a/modules/block/block.admin.inc b/modules/block/block.admin.inc
index ba31b9c..1fee16a 100644
--- a/modules/block/block.admin.inc
+++ b/modules/block/block.admin.inc
@@ -77,7 +77,7 @@ function block_admin_display_prepare_blocks($theme) {
  */
 function block_admin_display_form($form, &$form_state, $blocks, $theme, $block_regions = NULL) {
 
-  drupal_add_css(drupal_get_path('module', 'block') . '/block.admin.css');
+  $form['#attached']['css'] = array(drupal_get_path('module', 'block') . '/block.admin.css');
 
   // Get a list of block regions if one was not provided.
   if (!isset($block_regions)) {
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index eb81870..cfd419f 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -679,6 +679,13 @@ function taxonomy_term_delete($tid) {
             if (count($parents) == 1) {
               $orphans[] = $child->tid;
             }
+            // If the term has multiple parents, remove the reference to the
+            // deleted parent.
+            else if (count($parents) > 1) {
+              db_delete('taxonomy_term_hierarchy')
+                ->condition('parent', $tid)
+                ->execute();
+            }
           }
         }