Merge branch 'develop' into attachSvgRenderer

package.json

@@ -89,13 +89,13 @@
     "redux-throttle": "0.1.1",
     "rimraf": "^2.6.1",
     "scratch-audio": "0.1.0-prerelease.1523977528",
-    "scratch-blocks": "0.1.0-prerelease.1525467275",
+    "scratch-blocks": "0.1.0-prerelease.1525981783",
     "scratch-l10n": "2.0.20180108132626",
     "scratch-paint": "0.2.0-prerelease.20180510175214",
     "scratch-render": "0.1.0-prerelease.20180510210730",
     "scratch-storage": "0.4.1",
     "scratch-svg-renderer": "0.1.0-prerelease.20180510181711",
-    "scratch-vm": "0.1.0-prerelease.1525975472",
+    "scratch-vm": "0.1.0-prerelease.1525981075",
     "selenium-webdriver": "3.6.0",
     "startaudiocontext": "1.2.1",
     "style-loader": "^0.21.0",