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