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