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