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