Fix location of auth provider.
Merge branch 'master' into unstable