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