Merge pull request #2970 from octo/ff/oauth