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