Merge pull request #182 from adrian-the-git/master

Fix incompatibility with oauth2client v2.0.0.