Merge pull request #10148 from annando/detecting-photo-page