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