Preparation for integration tests for analytics.
Merge branch 'master' of https://github.com/sosandstrom/open-server