Fix for nested attribute lookups where one is a callable
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework