Use production OAuth settings
Merge branch 'develop'