Merge branch 'MDL-61205_m35v1' of git://github.com/sbourget/moodle