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