getphotourl update
Merge remote-tracking branch 'Rock-Upstream/develop' into develop
Merge branch 'develop' into feature-csf-PhotoUrlFix
Merge pull request #572 from chrisfunk/feature-csf-PhotoUrlFix

Feature csf photo url fix