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