Merge branch 'w51_MDL-37191_m25_plugindelete' of git://github.com/skodak/moodle