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