Workaround for summernote add image/video/link modals issue
Merge 'master' into 'tinymce-attempt' with 'ours' strategy
'tinymce-attempt' becomes the new 'master' branch
Merge branch 'master' into tinymce-attempt