Merge change 5521

* changes:
  Adding mouse events to the plugin API