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