Begin changing the authentication scheme from token based to basic authentication.
Merge remote-tracking branch 'origin/master'