Use auth.api as oauth.api is optional
Merge branch 'master' into gh-pages
rebuild