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