diff --git a/core/includes/menu.inc b/core/includes/menu.inc
index ddb4e0b..3b241fa 100644
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@ -1122,7 +1122,10 @@ function menu_tree_output(array $tree, $add_active_classes = TRUE) {
 
     // Allow menu-specific theme overrides.
     $element['#theme'] = 'menu_link__' . strtr($data['link']['menu_name'], '-', '_');
-    $element['#attributes']['class'] = $class;
+    $element['#attributes'] = array(
+      'class' => $class,
+      'data-drupal-menu-' . (!empty($data['link']['expanded']) ? 'expand' : 'collapse') => 'true',
+    );
     $element['#title'] = $data['link']['title'];
     $element['#href'] = $data['link']['href'];
     $element['#localized_options'] = !empty($data['link']['localized_options']) ? $data['link']['localized_options'] : array();
diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
index c3706ad..fb603db 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -166,7 +166,7 @@ function toolbar_page_build(&$page) {
   // @todo Just for testing. Remove.
   if ($depth = drupal_container()->get('request')->query->get('toolbar-tmp-depth')) {
     $t0 = microtime(TRUE);
-    $menu = 'management';
+    $menu = 'admin';
     $tree = menu_tree_all_data($menu, NULL, $depth);
     $t1 = microtime(TRUE);
     $element = menu_tree_output($tree, FALSE);