Merge branch 'MDL-64856_m37v1' of git://github.com/sbourget/moodle