Merge branch 'MDL-38001-master' of git://github.com/mouneyrac/moodle