Merge branch 'w29_MDL-40574_m26_editordelete' of https://github.com/skodak/moodle