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