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