Merge change I65440eb5 into eclair-mr2

* changes:
  Fix how the monkey counts events for scripts.