Merge branch 'w40_MDL-41176_m26_useredit' of https://github.com/skodak/moodle