Fixed broken title encoding in image viewer
Merge branch '2.0'