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