Merge branch 'w36_MDL-41267_m26_toolsubplugins' of https://github.com/skodak/moodle