Merge branch 'mdl-26299' of git://github.com/mackensen/moodle