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