Merge conflict.
Merge branch 'master' of https://github.com/pgillet/Glue.git
Google analytics.