Merge branch 'MDL-54702_master' of https://github.com/snake/moodle