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