Merge branch 'master' into develop

pkg/api/dashboard.go

@@ -187,6 +187,7 @@ func PostDashboard(c *middleware.Context, cmd m.SaveDashboardCommand) Response {
 		Message:   cmd.Message,
 		OrgId:     c.OrgId,
 		UserId:    c.UserId,
+		Overwrite: cmd.Overwrite,
 	}
 
 	dashboard, err := dashboards.GetRepository().SaveDashboard(dashItem)

public/app/plugins/datasource/graphite/graphite_query.ts

@@ -121,7 +121,11 @@ export default class GraphiteQuery {
   }
 
   hasSelectMetric() {
-    return this.segments[this.segments.length - 1].value === 'select metric';
+    if (this.segments.length > 0) {
+      return this.segments[this.segments.length - 1].value === 'select metric';
+    } else {
+      return false;
+    }
   }
 
   addFunction(newFunc) {