Merge branch 'master' into packaging_refactoring

public/app/panels/graph/graph.tooltip.js

@@ -82,14 +82,17 @@ function ($) {
     };
 
     elem.mouseleave(function () {
-      if (scope.panel.tooltip.shared || dashboard.sharedCrosshair) {
+      if (scope.panel.tooltip.shared) {
         var plot = elem.data().plot;
         if (plot) {
           $tooltip.detach();
           plot.unhighlight();
-          scope.appEvent('clearCrosshair');
         }
       }
+
+      if (dashboard.sharedCrosshair) {
+        scope.appEvent('clearCrosshair');
+      }
     });
 
     elem.bind("plothover", function (event, pos, item) {

public/app/partials/help_modal.html

@@ -2,7 +2,7 @@
 	<div class="gf-box-header">
 		<div class="gf-box-title">
 			<i class="fa fa-keyboard-o"></i>
-			Keyboard shutcuts
+			Keyboard shortcuts
 		</div>
 
 		<button class="gf-box-header-close-btn" ng-click="dismiss();">

public/app/plugins/datasource/influxdb/datasource.js

@@ -105,6 +105,9 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
         case 'TAG_VALUES':
           var tagValues = _.flatten(series.values);
           return _.map(tagValues, function(tagValue) { return { text: tagValue, expandable: true }; });
+        default: // template values service does not pass in a a query type
+          var flattenedValues = _.flatten(series.values);
+          return _.map(flattenedValues, function(value) { return { text: value, expandable: true }; });
         }
       });
     };