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