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