more readable code
Merge remote-tracking branch 'django_unchained/master'