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