Merge branch 'MDL-62225-master' of https://github.com/lucisgit/moodle