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