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

tacaswell · tacaswell · commit 26996646159f · 2015-12-23T12:25:49.000-05:00
diff --git a/lib/matplotlib/backends/qt_editor/figureoptions.py b/lib/matplotlib/backends/qt_editor/figureoptions.py
@@ -158,7 +158,7 @@ def apply_callback(data):
 
         if generate_legend:
             draggable = None
-            ncol = None
+            ncol = 1
             if axes.legend_ is not None:
                 old_legend = axes.get_legend()
                 draggable = old_legend._draggable is not None
