Photo viewer caption fix
Merge branch 'dev'