merged latest django-brac3s