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