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