Merge branch 'master' of https://github.com/tomchristie/django-rest-framework into feature/filepathfield
