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