Merge branch 'master' into ticker

diff --cc auto_tests/misc/local.html
index b19ae43,1fba05c..d05ed32
--- 1/auto_tests/misc/local.html
--- 2/auto_tests/misc/local.html
+++ b/auto_tests/misc/local.html
@@@ -28,9 -27,8 +28,10 @@@
    <script type="text/javascript" src="../tests/custom_bars.js"></script>
    <script type="text/javascript" src="../tests/css.js"></script>
    <script type="text/javascript" src="../tests/selection.js"></script>
+   <script type="text/javascript" src="../tests/rolling_average.js"></script>
    <script type="text/javascript" src="../tests/update_options.js"></script>
 +  <script type="text/javascript" src="../tests/utils_test.js"></script>
 +  <script type="text/javascript" src="../tests/multiple_axes.js"></script>
  
  
    <script type="text/javascript">

diff --cc dygraph.js
Simple merge