Changed the way the custom events are sent back to the GA.
Merge branch 'master' into production