        [mNativeMenuItem setKeyEquivalentModifierMask:macModifiers];
  
        NSString *keyEquivalent = [[NSString stringWithCharacters:(unichar*)keyChar.get()
-                                                          length:keyChar.Length()] lowercaseString];
-       if ([keyEquivalent isEqualToString:@" "])
-         [mNativeMenuItem setKeyEquivalent:@""];
-       else
-         [mNativeMenuItem setKeyEquivalent:keyEquivalent];
-diff --git a/widget/cocoa/nsNativeThemeCocoa.mm b/widget/cocoa/nsNativeThemeCocoa.mm
---- a/widget/cocoa/nsNativeThemeCocoa.mm
-+++ b/widget/cocoa/nsNativeThemeCocoa.mm
-@@ -2607,17 +2607,17 @@ nsNativeThemeCocoa::DrawWidgetBackground
-     }
-       break;
- 
-     case NS_THEME_WINDOW_TITLEBAR: {
-       NSWindow* win = NativeWindowForFrame(aFrame);
+diff -r fec90cbfbaad widget/cocoa/nsNativeThemeCocoa.mm
+--- a/widget/cocoa/nsNativeThemeCocoa.mm	Thu Apr 09 22:57:56 2015 -0400
++++ b/widget/cocoa/nsNativeThemeCocoa.mm	Thu Feb 11 17:49:41 2016 +0100
+@@ -2612,7 +2612,7 @@
        BOOL isMain = [win isMainWindow];
        float unifiedToolbarHeight = [win isKindOfClass:[ToolbarWindow class]] ?
          [(ToolbarWindow*)win unifiedToolbarHeight] : macRect.size.height;

   // We don't want to send a location change when we're displaying an error
   // page, and we don't want to change our idea of "current URI" either
   if (mLoadType == LOAD_ERROR_PAGE) {
     return false;
   }
 
   mCurrentURI = NS_TryToMakeImmutable(aURI);
 
diff --git a/dom/base/nsCopySupport.cpp b/dom/base/nsCopySupport.cpp
--- a/dom/base/nsCopySupport.cpp
+++ b/dom/base/nsCopySupport.cpp
@@ -130,17 +130,18 @@ SelectionCopyHelper(nsISelection *aSel, 
     nsCOMPtr<nsIHTMLDocument> htmlDoc = do_QueryInterface(aDoc);
     if (!htmlDoc) {
       selForcedTextPlain = true;
     }
   }
 
   // The mime type is ultimately text/html if the encoder successfully encoded
   // the selection as text/html.

   /**
    * Add listener for insertion override
    * @param inFilter  function which callers want called during insertion
diff -r fec90cbfbaad gfx/src/nsColor.cpp
--- a/gfx/src/nsColor.cpp	Thu Apr 09 22:57:56 2015 -0400
+++ b/gfx/src/nsColor.cpp	Thu Feb 11 17:49:41 2016 +0100
@@ -214,6 +214,27 @@
   return false;
 }
 
