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