Merge branch 'w39_MDL-41437_m26_mia' of https://github.com/skodak/moodle