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