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