Merge branch 'MDL-61203_m35v3' of git://github.com/sbourget/moodle