fixed logging in without credentials
Merge origin/master