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