Merge branch 'master' into writable-nested-modelserializer
Merge branch 'writable-nested-modelserializer' of https://github.com/tomchristie/django-rest-framework into writable-nested-modelserializer
Merge branch 'master' into writable-nested-modelserializer
Merge remote-tracking branch 'upstream/writable-nested-modelserializer' into writable-nested-modelserializer