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