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