Merge branch 'develop' into HistogramItemNaming

Author: objorke

CHANGELOG.md

@@ -59,6 +59,7 @@ All notable changes to this project will be documented in this file.
 - Out of memory exception and performance issue with Catmull-Rom Spline (#1237)
 - Cache and Dispose Brush and Pen objects used by GraphicsRenderContext (#1230)
 - Fixed references to RectangleItem in HistogramSeries
+- Fix AxisChangedEventArgs.DeltaMaximum in Axes.Reset (#1306)
 
 ## [1.0.0] - 2016-09-11
 ### Added

README.md

@@ -1,19 +1,16 @@
 OxyPlot is a cross-platform plotting library for .NET
 
-- [Web page](http://oxyplot.org/)
-- [Documentation](http://docs.oxyplot.org/)
-- [Announcements](http://oxyplot.org/announcements) / [atom](http://oxyplot.org/atom.xml)
-- [Discussion forum](http://discussion.oxyplot.org/)
-- [Source repository](http://github.com/oxyplot/oxyplot)
-- [Issue tracker](http://github.com/oxyplot/oxyplot/issues)
-- [NuGet packages](http://www.nuget.org/packages?q=oxyplot)
-- [Stack Overflow](http://stackoverflow.com/questions/tagged/oxyplot)
+- [Web page](https://oxyplot.github.io)
+- [Documentation](https://oxyplot.readthedocs.io/en/latest/)
+- [Discussion forum](https://oxyplot.userecho.com/)
+- [NuGet packages](https://www.nuget.org/packages?q=oxyplot)
+- [Stack Overflow](https://stackoverflow.com/questions/tagged/oxyplot)
 - [Twitter](https://twitter.com/hashtag/oxyplot)
 - [Gitter](https://gitter.im/oxyplot/oxyplot) (chat)
 
 ![License](https://img.shields.io/badge/license-MIT-red.svg) [![Build status](https://img.shields.io/appveyor/ci/objorke/oxyplot/develop.svg)](https://ci.appveyor.com/project/objorke/oxyplot)
 
-![Plot](http://oxyplot.org/public/images/normal-distributions.png)
+![Plot](https://oxyplot.github.io/public/images/normal-distributions.png)
 
 #### Getting started
 

Source/OxyPlot/Axes/Axis.cs

@@ -964,7 +964,7 @@ public virtual void Render(IRenderContext rc, int pass)
         public virtual void Reset()
         {
             var oldMinimum = this.ActualMinimum;
-            var oldMaximum = this.ActualMinimum;
+            var oldMaximum = this.ActualMaximum;
 
             this.ViewMinimum = double.NaN;
             this.ViewMaximum = double.NaN;
@@ -1734,4 +1734,4 @@ protected virtual void OnTransformChanged(EventArgs args)
             }
         }
     }
-}
+}