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