Merge branch 'MDLmaster-MDL-37157-2' of https://github.com/OdyX/moodle