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