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