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