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