Properly escape URLs when replacing query parameter
Merge branch 'master' into version-3.0
Merge branch 'version-3.0' of https://github.com/tomchristie/django-rest-framework into version-3.0