merge master

diff --cc dygraph.js
index 88ad4b8,00af051..fe677f2
--- 1/dygraph.js
--- 2/dygraph.js
+++ b/dygraph.js
@@@ -4144,41 -4198,11 +4206,47 @@@ Dygraph.OPTIONS_REFERENCE =  // <JSON
      "default": "null",
      "description": "A value representing the farthest a graph may be panned, in percent of the display. For example, a value of 0.1 means that the graph can only be panned 10% pased the edges of the displayed values. null means no bounds."
    },
 +  "title": {
 +    "labels": ["Chart labels"],
 +    "type": "string",
 +    "default": "null",
 +    "description": "Text to display above the chart. You can supply any HTML for this value, not just text. If you wish to style it using CSS, use the 'dygraph-label' or 'dygraph-title' classes."
 +  },
 +  "titleHeight": {
 +    "default": "18",
 +    "labels": ["Chart labels"],
 +    "type": "integer",
 +    "description": "Height of the chart title, in pixels. This also controls the default font size of the title. If you style the title on your own, this controls how much space is set aside above the chart for the title's div."
 +  },
 +  "xlabel": {
 +    "labels": ["Chart labels"],
 +    "type": "string",
 +    "default": "null",
 +    "description": "Text to display below the chart's x-axis. You can supply any HTML for this value, not just text. If you wish to style it using CSS, use the 'dygraph-label' or 'dygraph-xlabel' classes."
 +  },
 +  "xLabelHeight": {
 +    "labels": ["Chart labels"],
 +    "type": "integer",
 +    "default": "18",
 +    "description": "Height of the x-axis label, in pixels. This also controls the default font size of the x-axis label. If you style the label on your own, this controls how much space is set aside below the chart for the x-axis label's div."
 +  },
 +  "ylabel": {
 +    "labels": ["Chart labels"],
 +    "type": "string",
 +    "default": "null",
 +    "description": "Text to display to the left of the chart's y-axis. You can supply any HTML for this value, not just text. If you wish to style it using CSS, use the 'dygraph-label' or 'dygraph-ylabel' classes. The text will be rotated 90 degrees by default, so CSS rules may behave in unintuitive ways. No additional space is set aside for a y-axis label. If you need more space, increase the width of the y-axis tick labels using the yAxisLabelWidth option. If you need a wider div for the y-axis label, either style it that way with CSS (but remember that it's rotated, so width is controlled by the 'height' property) or set the yLabelWidth option."
 +  },
 +  "yLabelWidth": {
 +    "labels": ["Chart labels"],
 +    "type": "integer",
 +    "default": "18",
 +    "description": "Width of the div which contains the y-axis label. Since the y-axis label appears rotated 90 degrees, this actually affects the height of its div."
++  },
+   "isZoomedIgnoreProgrammaticZoom" : {
+     "default": "false",
+     "labels": ["Zooming"],
+     "type": "boolean",
+     "description" : "When this option is passed to updateOptions() along with either the <code>dateWindow</code> or <code>valueRange</code> options, the zoom flags are not changed to reflect a zoomed state. This is primarily useful for when the display area of a chart is changed programmatically and also where manual zooming is allowed and use is made of the <code>isZoomed</code> method to determine this."
    }
  }
  ;  // </JSON>