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