Merge branch 'master' into websocket

public/app/features/panel/panel_directive.ts

@@ -121,7 +121,7 @@ module.directive('panelResizer', function($rootScope) {
         }
         }
 
 
         scope.$apply(function() {
         scope.$apply(function() {
-          scope.$broadcast('render');
+          ctrl.broadcastRender();
         });
         });
       }
       }