django-debug-toolbar 1.0 compatibility
Merge branch 'rouge8-master'