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