Merge pull request #3102 from rubenk/oauth-fix-compiler-warning