Merge branch 'MDL-31604-attempt3' of git://github.com/mouneyrac/moodle