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