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