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