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