Merge branch 'MDL-34971-wip' of git://github.com/mouneyrac/moodle