Use the preview property to store and retrieve the image previews. Fixes #2592
Merge branch 'master' into gh-pages