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