Merge "Deprecates 'format' in Javelin image description"