Zoom to really large

.. because when we're comparing we'll need it.
merge upstream into master
merge master into personal