Merge branch 'release/1.0'
Merge branch 'master' of ssh://github.com/praekelt/django-recaptcha into develop