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