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