Small typo
Merge pull request #1033 from martync/patch-1

Fix typo
Add @martync for #1033 thanks!
don't set X-Throttle-Wait-Second header if throttle wait is None
Fix for "No module named compat"
Merge pull request #1039 from rotajota/master

Fix for "No module named compat"
Merge pull request #1038 from jsatt/nontime_throttling

don't set X-Throttle-Wait-Second header if throttle wait is None
Added @jsatt.

For fix & tests in #1037.
Merge branch 'master' of github.com:tomchristie/django-rest-framework into writable-nested-modelserializer