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