Add first attempt at a username/password OAuth 2 flow
Merge remote-tracking branch 'origin/develop' into develop