Make photo viz slightly less broken.
Merge pull request #1560 from NatTuck/photos-viz

Make photo viz slightly less broken.
Merge remote-tracking branch 'upstream/master' into jp1532