Merge branch 'master' into wip_leon_T7771_html_editor_image_captions