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