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