fixes a bug in django 1.6 with django.apps.apps not existing
Merge branch 'issue-42'