Merge branch 'develop' into greenkeeper/scratch-l10n-3.0.20180712200642

package.json

@@ -96,7 +96,7 @@
     "redux-throttle": "0.1.1",
     "rimraf": "^2.6.1",
     "scratch-audio": "0.1.0-prerelease.20180625202813",
-    "scratch-blocks": "0.1.0-prerelease.1531409796",
+    "scratch-blocks": "0.1.0-prerelease.1531424474",
     "scratch-l10n": "3.0.20180712200642",
     "scratch-paint": "0.2.0-prerelease.20180712144339",
     "scratch-render": "0.1.0-prerelease.20180618173030",