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