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