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