Merge change 2713

* changes:
  in the browser, make the trackball more like a mouse