Merge photo-upload into Master.