Restores Basic Authentication, fixes #60
Merge remote-tracking branch 'upstream/master'