Merge branch 'master' of github.com:grafana/grafana

Conflicts:
	pkg/services/alerting/eval_context.go

public/app/features/alerting/alert_tab_ctrl.ts

@@ -108,6 +108,13 @@ export class AlertTabCtrl {
     }));
   }
 
+  changeTabIndex(newTabIndex) {
+    this.subTabIndex = newTabIndex;
+
+    if (this.subTabIndex === 2) {
+      this.getAlertHistory();
+    }
+  }
 
   notificationAdded() {
     var model = _.findWhere(this.notifications, {name: this.addNotificationSegment.value});