Bug 988396 - URL generation flow
Merge pull request #6 from jaoo/988396

Bug 988396 - URL generation flow. r=ferjm,borjasalguero