oauthlogin commit
Merge branch 'nldjyhl'