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