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