Merge branch 'hotfix-0.9.5.2'
commiting gos changes so far.
Merge branch 'master' of github.com:mikejw/empathy into gos_branch