Fixed google analytics stuff.
Merge branch 'release/6.4.0'