Small change to merge into master.
Merge with fix-image-viewer-memory-leak