Merge branch 'MDL-34377' of git://github.com/raymondAntonio/moodle