Upgrade django rest framework
Merge branch 'hotfix/20141003-fix'