Merge branch 'MDL-43648_m35v2' of https://github.com/sbourget/moodle