URL fixes for oauth bounce.
Merge branch 'master' into i18n