Merge branch 'MDL-35997-wip1' of git://github.com/mouneyrac/moodle