Merge branch 'MDL-54128_masterv2' of https://github.com/snake/moodle