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