Merge branch 'MDL-25621' of git://github.com/samhemelryk/moodle