Merge SocialAuth into master