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