Fix bug 34.
Merge remote-tracking branch 'upstream/master' into mouse_zooming