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