Merge "Fix how the monkey counts events for scripts." into eclair