Simplify field inclusion test
Merge branch 'master' of github.com:funkybob/django-nap
Merge branch 'master' of github.com:funkybob/django-nap
Merge branch 'master' of github.com:funkybob/django-nap