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