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