Merge pull request #10095 from annando/parseurl-photos