Merge branch 'MDL-60494-stray_img_end-39' of https://github.com/leonstr/moodle into...