Bugfix gtalk repo
Merge branch 'fix-gtalk'