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