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