Changes to autoscaling and scalebox for QGIS 2.4