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