Merge branch 'MDL-32917-master-nomerge2' of git://github.com/mouneyrac/moodle