Merge conflicts.
Merge branch 'master' of https://github.com/pgillet/Glue.git
Merge branch 'master' of https://github.com/pgillet/Glue.git
Merge branch 'master' of https://github.com/pgillet/Glue.git
Merge conflicts.
Merge conflicts.
Merge branch 'master' of https://github.com/pgillet/Glue.git
Venue reconciliation bug.