Merge branch 'master' into as-tiled-rendering

src/browser/application-menu.coffee

@@ -162,8 +162,8 @@ class ApplicationMenu
     firstKeystroke = keystrokesByCommand[command]?[0]
     return null unless firstKeystroke
 
-    modifiers = firstKeystroke.split('-')
-    key = modifiers.pop()
+    modifiers = firstKeystroke.split(/-(?=.)/)
+    key = modifiers.pop().toUpperCase().replace('+', 'Plus')
 
     modifiers = modifiers.map (modifier) ->
       modifier.replace(/shift/ig, "Shift")
@@ -171,5 +171,5 @@ class ApplicationMenu
               .replace(/ctrl/ig, "Ctrl")
               .replace(/alt/ig, "Alt")
 
-    keys = modifiers.concat([key.toUpperCase()])
+    keys = modifiers.concat([key])
     keys.join("+")

src/decoration.coffee

@@ -201,6 +201,6 @@ if Grim.includeDeprecatedAPIs
     Grim.deprecate 'Use Decoration::getProperties instead'
     @getProperties()
 
-  Decoration::update = -> (newProperties) ->
+  Decoration::update = (newProperties) ->
     Grim.deprecate 'Use Decoration::setProperties instead'
     @setProperties(newProperties)

src/tooltip-manager.coffee

@@ -87,8 +87,9 @@ class TooltipManager
 
     new Disposable ->
       tooltip = $target.data('bs.tooltip')
-      tooltip.leave(currentTarget: target)
-      tooltip.hide()
+      if tooltip?
+        tooltip.leave(currentTarget: target)
+        tooltip.hide()
       $target.tooltip('destroy')
 
 humanizeKeystrokes = (keystroke) ->