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