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