diff --git a/includes/menu.inc b/includes/menu.inc
index 0e9c977..db9f081 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -309,7 +309,7 @@ define('MENU_PREFERRED_LINK', '1cf698d64d1aa4b83907cf6ed55db3a7f8e92c91');
  * actually exists. This list of 'masks' is built in menu_rebuild().
  *
  * @param $parts
- *   An array of path parts; for the above example, 
+ *   An array of path parts; for the above example,
  *   array('node', '12345', 'edit').
  *
  * @return
@@ -2863,7 +2863,16 @@ function _menu_navigation_links_rebuild($menu) {
     // check this for parents instead of querying the database.
     $parent_candidates = array();
     // Make sure no child comes before its parent.
-    array_multisort($sort, SORT_NUMERIC, $menu_links);
+    // This normally might cause a PHP notice, and work is being done at
+    // https://www.drupal.org/node/972536 to replace array_multisort() with
+    // another approach. However, until the remaining tasks are complete (making
+    // tests pass, making sure there are no performance issues, etc.), adding the
+    // error-suppression marker (@) to array_multisort will prevent the notice. It
+    // is best to avoid the error-suppression marker where possible, using other
+    // techniques to prevent showing the error; but for projects which use a continuous
+    // integration server which will break a build on such a notice, the error-supression
+    // marker can be an acceptable, temporary, workaround.
+    @array_multisort($sort, SORT_NUMERIC, $menu_links);
 
     foreach ($menu_links as $key => $item) {
       $existing_item = db_select('menu_links')