Merge branch 'master' of git://github.com/pennersr/django-allauth into HEAD
Merge commit '5e1771ad3d428f65b93ea296fbcdb688c44869fa'