Merge branch 'w16_MDL-32405_m23_estrict4' of git://github.com/skodak/moodle