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