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