Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	dist/vis.js
	dist/vis.map
	dist/vis.min.js

lib/timeline/component/LineGraph.js

@@ -77,6 +77,7 @@ function LineGraph(body, options) {
   this.props = {};
   this.hammer = null;
   this.groups = {};
+  this.abortedGraphUpdate = false;
 
   var me = this;
   this.itemsData = null;    // DataSet
@@ -521,7 +522,7 @@ LineGraph.prototype.redraw = function() {
     this.svg.style.width = util.option.asSize(3*this.width);
     this.svg.style.left = util.option.asSize(-this.width);
   }
-  if (zoomed == true) {
+  if (zoomed == true || this.abortedGraphUpdate == true) {
     this._updateGraph();
   }
 
@@ -574,9 +575,11 @@ LineGraph.prototype._updateGraph = function () {
       changeCalled = this._updateYAxis(groupIds, groupRanges);
       if (changeCalled == true) {
         DOMutil.cleanupElements(this.svgElements);
+        this.abortedGraphUpdate = true;
         this.body.emitter.emit("change");
         return;
       }
+      this.abortedGraphUpdate = false;
 
       // With the yAxis scaled correctly, use this to get the Y values of the points.
       for (i = 0; i < groupIds.length; i++) {