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