merging upstream and adding social auth