Merge remote-tracking branch 'upstream/master'

* upstream/master:
  use showHelp.close when it's defined

edit/beautify.js

@@ -40,7 +40,8 @@ function beautify(event) {
         $create('.buttons', [
           $create('button', {
             attributes: {role: 'close'},
-            onclick: showHelp.close,
+            // showHelp.close will be defined after showHelp() is invoked
+            onclick: () => showHelp.close(),
           }, t('confirmClose')),
           $create('button', {
             attributes: {role: 'undo'},