Merge branch 'develop' into greenkeeper/scratch-blocks-0.1.0-prerelease.1531482946

package.json

@@ -97,8 +97,8 @@
     "rimraf": "^2.6.1",
     "scratch-audio": "0.1.0-prerelease.20180625202813",
     "scratch-blocks": "0.1.0-prerelease.1531482946",
-    "scratch-l10n": "3.0.20180703181510",
-    "scratch-paint": "0.2.0-prerelease.20180712144339",
+    "scratch-l10n": "3.0.20180712200642",
+    "scratch-paint": "0.2.0-prerelease.20180712195436",
     "scratch-render": "0.1.0-prerelease.20180618173030",
     "scratch-storage": "0.5.1",
     "scratch-svg-renderer": "0.2.0-prerelease.20180712223402",

src/containers/blocks.jsx

@@ -366,9 +366,10 @@ class Blocks extends React.Component {
         this.ScratchBlocks.refreshStatusButtons(this.workspace);
     }
     handlePromptCallback (input, optionSelection) {
-        this.state.prompt.callback(input, optionSelection,
-            (optionSelection === 'local') ? [] :
-                this.props.vm.runtime.getAllVarNamesOfType(this.state.prompt.varType));
+        this.state.prompt.callback(
+            input,
+            this.props.vm.runtime.getAllVarNamesOfType(this.state.prompt.varType),
+            optionSelection);
         this.handlePromptClose();
     }
     handlePromptClose () {