Merge branch 'MD-31803' of git://github.com/mouneyrac/moodle