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