FIX: do not always reset scales from figureoptions#6281

mdboom merged 1 commit intomatplotlib:v1.5.xmatplotlib/matplotlib:v1.5.xfrom

tacaswell:fix_qt_setscalestacaswell/matplotlib:fix_qt_setscalesCopy head branch name to clipboard