Merge "update djangorestframework version"