diff --git a/appveyor.yml b/appveyor.yml
index 1b6027b5eb6..22f0e5606dc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,7 +25,10 @@ install:
 build_script:
   - go run build.go build
   - grunt release
+  #- 7z a grafana.zip %APPVEYOR_BUILD_FOLDER%\dist\*
+  - cp dist/* .
 
 artifacts:
-  - path: dist/*
+  - path: grafana-*windows-ia32.zip
+  #- path: dist/*
     name: binzip
diff --git a/circle.yml b/circle.yml
index 007d0b29217..39dc626df04 100644
--- a/circle.yml
+++ b/circle.yml
@@ -28,3 +28,4 @@ deployment:
     owner: grafana
     commands:
       - ./scripts/trigger_grafana_packer.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN}
+      - ./scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN}
diff --git a/docs/sources/reference/graph.md b/docs/sources/reference/graph.md
index 9c2ab63fbaa..2e26334347e 100644
--- a/docs/sources/reference/graph.md
+++ b/docs/sources/reference/graph.md
@@ -91,7 +91,7 @@ The legend values are calculated client side by Grafana and depend on what type
 aggregation or point consolidation you metric query is using. All the above legend values cannot
 be correct at the same time. For example if you plot a rate like requests/second, this is probably
 using average as aggregator, then the Total in the legend will not represent the total number of requests.
-It is just the sum of all data data points received by Grafana.
+It is just the sum of all data points received by Grafana.
 
 ## Display styles
 
diff --git a/pkg/login/ldap.go b/pkg/login/ldap.go
index cee7096dc45..97a34f129b1 100644
--- a/pkg/login/ldap.go
+++ b/pkg/login/ldap.go
@@ -30,7 +30,7 @@ func (a *ldapAuther) Dial() error {
 	var err error
 	var certPool *x509.CertPool
 	if a.server.RootCACert != "" {
-		certPool := x509.NewCertPool()
+		certPool = x509.NewCertPool()
 		for _, caCertFile := range strings.Split(a.server.RootCACert, " ") {
 			if pem, err := ioutil.ReadFile(caCertFile); err != nil {
 				return err
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 28eaaa5b5d5..94d93d3743e 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -461,7 +461,7 @@ func NewConfigContext(args *CommandLineArgs) error {
 
 	Env = Cfg.Section("").Key("app_mode").MustString("development")
 	InstanceName = Cfg.Section("").Key("instance_name").MustString("unknown_instance_name")
-	PluginsPath = Cfg.Section("paths").Key("plugins").String()
+	PluginsPath = makeAbsolute(Cfg.Section("paths").Key("plugins").String(), HomePath)
 
 	server := Cfg.Section("server")
 	AppUrl, AppSubUrl = parseAppUrlAndSubUrl(server)
diff --git a/public/app/plugins/panel/graph/graph.ts b/public/app/plugins/panel/graph/graph.ts
index a07701cef65..7e19d00251f 100755
--- a/public/app/plugins/panel/graph/graph.ts
+++ b/public/app/plugins/panel/graph/graph.ts
@@ -384,10 +384,32 @@ module.directive('grafanaGraph', function($rootScope, timeSrv) {
         if (!annotations || annotations.length === 0) {
           return;
         }
+        console.log(annotations);
 
         var types = {};
+        types['$__alerting'] = {
+          color: 'rgba(237, 46, 24, 1)',
+          position: 'BOTTOM',
+          markerSize: 5,
+        };
+        types['$__ok'] = {
+          color: 'rgba(11, 237, 50, 1)',
+          position: 'BOTTOM',
+          markerSize: 5,
+        };
+        types['$__nodata'] = {
+          color: 'rgba(150, 150, 150, 1)',
+          position: 'BOTTOM',
+          markerSize: 5,
+        };
+
         for (var i = 0; i < annotations.length; i++) {
           var item = annotations[i];
+          if (item.newState) {
+            console.log(item.newState);
+            item.eventType = '$__' + item.newState;
+            continue;
+          }
 
           if (!types[item.source.name]) {
             types[item.source.name] = {
diff --git a/scripts/trigger_windows_build.sh b/scripts/trigger_windows_build.sh
new file mode 100755
index 00000000000..521a365a299
--- /dev/null
+++ b/scripts/trigger_windows_build.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+_token=$1
+
+curl \
+  -H "Content-Type: application/json" \
+  -H "Authorization: Bearer ${_token}" \
+  -X POST -d '{ "accountName": "Torkeldegaard", "projectSlug": "grafana","branch": "master","environmentVariables": {}}' \
+  https://ci.appveyor.com/api/builds