Issue #167
Merge branch 'master' of django-browserid
Merge branch 'master' of https://github.com/pramodhkp/django-browserid