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