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