Add tracking code for GoSquared.
Fix merge conflict.