Pla 539

!! Please don't merge just yet !!

@kflorence please review Tracking.js