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