Fix merge popup
Merge branch 'master' of github.com:CIRB/django-fixmystreet