Merge branch 'master' into develop

public/vendor/flot/jquery.flot.js

@@ -2310,12 +2310,13 @@ Licensed under the MIT license.
         }
         }
 
 
         function drawSeries(series) {
         function drawSeries(series) {
-            if (series.lines.show)
+            if (series.lines.show) {
                 drawSeriesLines(series);
                 drawSeriesLines(series);
                 if (!series.points.show && !series.bars.show) {
                 if (!series.points.show && !series.bars.show) {
                     // not necessary if user wants points displayed for everything
                     // not necessary if user wants points displayed for everything
                     drawOrphanedPoints(series);
                     drawOrphanedPoints(series);
                 }
                 }
+            }
             if (series.bars.show)
             if (series.bars.show)
                 drawSeriesBars(series);
                 drawSeriesBars(series);
             if (series.points.show)
             if (series.points.show)