Make tests compatible with django 1.6
Rename get_query_set to get_queryset
Merge branch 'django1.6' into release