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