Merge branch 'v1.5.x' into v2.x

Author: jenshnielsen

Diff for: MANIFEST.in

@@ -19,3 +19,4 @@ recursive-include lib *
 recursive-include extern *
 include versioneer.py
 include lib/matplotlib/_version.py
+include tests.py

Diff for: doc/_templates/citing.html

@@ -28,6 +28,7 @@ <h1>Citing matplotlib</h1>
 
 <h2>DOIs</h2>
 <dl>
+  <dt>v1.5.1</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.44579"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.44579.svg" alt="10.5281/zenodo.44579"></a></dd>
   <dt>v1.5.0</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.32914"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.32914.svg" alt="10.5281/zenodo.32914"></a></dd>
   <dt>v1.4.3</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.15423"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.15423.svg" alt="10.5281/zenodo.15423"></a></dd>
   <dt>v1.4.2</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.12400"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.12400.png" alt="10.5281/zenodo.12400"></a></dd>

Diff for: doc/devel/MEP/MEP13.rst

@@ -1,5 +1,5 @@
 =================================
-MEP12: Use properties for Artists
+MEP13: Use properties for Artists
 =================================
 
 .. contents::

Diff for: doc/devel/MEP/MEP14.rst

@@ -1,5 +1,5 @@
 ====================
-MEP13: Text handling
+MEP14: Text handling
 ====================
 
 .. contents::

Diff for: examples/pylab_examples/legend_demo5.py

@@ -41,7 +41,7 @@ def create_artists(self, legend, orig_handle,
                 lw = orig_handle.get_linewidths()[i]
             except IndexError:
                 lw = orig_handle.get_linewidths()[0]
-            if dashes[0] != None:
+            if dashes[0] is not None:
                 legline.set_dashes(dashes[1])
             legline.set_color(color)
             legline.set_transform(trans)