Merge branch 'MDL-26237' of git://github.com/stronk7/moodle