Merge pull request #3924 from Dineshs91/googleplus-fix