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