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