Merge branch 'w41_MDL-41220_m26_pluginlist' of https://github.com/skodak/moodle