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