Add support for per-user return url
Merge branch 'master' into heroku