fixed
Merge https://github.com/zdanozdan/django-extensions