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