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