scale by mouse is now bordered
Merge remote-tracking branch 'origin'