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