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