Merge branch 'master' of git://github.com/toastdriven/django-tastypie
reducing number of queries in ToMany field dehydrate
Merge branch 'upstream'