Merge branch 'MDL-48962' of git://github.com/jmvedrine/moodle