Fixes Bug 1045003 - analytics is not defined
Merge branch 'adamlofting-bug1045003' into develop