Improve image captions.
Merge branch 'master' into image-caption
fix on arrow up/down marksAsSelected
Merge branch 'image-caption'