parse url before trying to get extension or suffer the death that is url params in file names
Merge commit '9016dc7e726416b6ca0709ae991ad6ad850e6374' into HEAD