Merge branch 'develop' into apple-banana

src/containers/blocks.jsx

@@ -338,7 +338,7 @@ class Blocks extends React.Component {
             const stageCostumes = stage.getCostumes();
             const targetCostumes = target.getCostumes();
             const targetSounds = target.getSounds();
-            const dynamicBlocksXML = this.props.vm.runtime.getBlocksXML();
+            const dynamicBlocksXML = this.props.vm.runtime.getBlocksXML(target);
             return makeToolboxXML(false, target.isStage, target.id, dynamicBlocksXML,
                 targetCostumes[targetCostumes.length - 1].name,
                 stageCostumes[stageCostumes.length - 1].name,

src/containers/stage.jsx

@@ -362,6 +362,7 @@ class Stage extends React.Component {
             this.drawDragCanvas(drawableData);
             this.positionDragCanvas(x, y);
             this.props.vm.postSpriteInfo({visible: false});
+            this.props.vm.renderer.draw();
         }
     }
     onStopDrag (mouseX, mouseY) {
@@ -387,12 +388,9 @@ class Stage extends React.Component {
             }
             this.props.vm.postSpriteInfo(spriteInfo);
             // Then clear the dragging canvas and stop drag (potentially slow if selecting sprite)
-            setTimeout(() => {
-                this.clearDragCanvas();
-                setTimeout(() => {
-                    commonStopDragActions();
-                }, 30);
-            }, 30);
+            this.clearDragCanvas();
+            commonStopDragActions();
+            this.props.vm.renderer.draw();
         } else {
             commonStopDragActions();
         }