Merge remote-tracking branch 'upstream/v1.2.x' into v1.3.x

Author: mdboom

matplotlibrc.template

@@ -191,7 +191,7 @@ backend      : %(backend)s
                        #             or the autohinter if none is available.
                        # For backward compatibility, this value may also be
                        # True === 'auto' or False === 'none'.
-text.hinting_factor : 8 # Specifies the amount of softness for hinting in the
+#text.hinting_factor : 8 # Specifies the amount of softness for hinting in the
                          # horizontal direction.  A value of 1 will hint to full
                          # pixels.  A value of 2 will hint to half pixels etc.