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