Merge branch 'hotfix/1.2a'
Merge branch 'release/2.0'
Add back in Google Analytics
Merge branch 'hotfix/google-analytics' into develop