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