Merge branch 'MDL-56820-master' of https://github.com/snake/moodle