Prevent infinite recursion in Django 1.6
Be more specific in the condition before setting 'fields'
Merge pull request #69 from borgstrom/django16

Prevent infinite recursion in Django 1.6