Merge branch 'w15_MDL-32365_m23_id' of git://github.com/skodak/moodle