Fixed issues with basic auth and NoneType errors
Merge remote-tracking branch 'origin/dev'
Fix for basicauth and no user/pass set
Merge remote-tracking branch 'origin/dev'