Add simple basic auth support
Merge remote-tracking branch 'origin/basic-auth' into merged-fixes