rulers now adjust their scale and the side ruler's text is rotated.
Merge remote-tracking branch 'origin/master'