Merge branch 'fix/photo-pagination-str' into 'master'

Ghost Userrequested to merge
cherry-pick-f59ca0b5 into release/1.12

Really fix photos pagination this time

See merge request !663 (merged)

(cherry picked from commit f59ca0b5)

2bb77b67 Really fix photos pagination this time

Merge request reports