Fix issues when adding an additional photo person tag
Merge branch 'tgs-tidypics-1.8' into tgs-tidypics