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