Merge branch 'MDL-27564-wip' of git://github.com/mouneyrac/moodle with changes for...