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