Merge pull request #1649 from nnnick/fix/scale_fitting

Improve the fitting of vertical axes