Merge branch 'MDL-71337-master' of git://github.com/junpataleta/moodle