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