Handles custom data= as request parameter
Merge branch 'master' into heroku