Merge pull request #5276 from minrk/oauth-17.3

Merge pull request #5276 from minrk/oauth-17.3 #1728